From 8d1f7304dd70fdaa99b2839a19a33329fa114e68 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Tue, 25 Jul 2023 06:57:19 +0200 Subject: [PATCH 1/6] net-news/newsraft: := for subslotted deps, USE=-native-symlinks compatibility Closes: https://bugs.gentoo.org/910445 Closes: https://bugs.gentoo.org/910448 Closes: https://bugs.gentoo.org/910449 Signed-off-by: Haelwenn (lanodan) Monnier --- net-news/newsraft/newsraft-0.19.ebuild | 10 +++++++--- net-news/newsraft/newsraft-9999.ebuild | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/net-news/newsraft/newsraft-0.19.ebuild b/net-news/newsraft/newsraft-0.19.ebuild index 750cc84726..f2923dc3fc 100644 --- a/net-news/newsraft/newsraft-0.19.ebuild +++ b/net-news/newsraft/newsraft-0.19.ebuild @@ -21,10 +21,10 @@ SLOT="0" DEPEND=" dev-db/sqlite:3 dev-libs/expat - dev-libs/gumbo - dev-libs/yajl + dev-libs/gumbo:= + dev-libs/yajl:= net-misc/curl - sys-libs/ncurses + sys-libs/ncurses:= " RDEPEND="${DEPEND}" BDEPEND=" @@ -32,6 +32,10 @@ BDEPEND=" virtual/pkgconfig " +src_compile() { + emake CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +} + src_install() { emake PREFIX="/usr" DESTDIR="${D}" install einstalldocs diff --git a/net-news/newsraft/newsraft-9999.ebuild b/net-news/newsraft/newsraft-9999.ebuild index 750cc84726..f2923dc3fc 100644 --- a/net-news/newsraft/newsraft-9999.ebuild +++ b/net-news/newsraft/newsraft-9999.ebuild @@ -21,10 +21,10 @@ SLOT="0" DEPEND=" dev-db/sqlite:3 dev-libs/expat - dev-libs/gumbo - dev-libs/yajl + dev-libs/gumbo:= + dev-libs/yajl:= net-misc/curl - sys-libs/ncurses + sys-libs/ncurses:= " RDEPEND="${DEPEND}" BDEPEND=" @@ -32,6 +32,10 @@ BDEPEND=" virtual/pkgconfig " +src_compile() { + emake CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +} + src_install() { emake PREFIX="/usr" DESTDIR="${D}" install einstalldocs From 7788764f4f0ce71687f77811ce35f3137574d3d6 Mon Sep 17 00:00:00 2001 From: Viorel Munteanu Date: Tue, 25 Jul 2023 10:01:36 +0300 Subject: [PATCH 2/6] dev-python/survey: add 4.5.4 Signed-off-by: Viorel Munteanu --- dev-python/survey/Manifest | 1 + dev-python/survey/survey-4.5.4.ebuild | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 dev-python/survey/survey-4.5.4.ebuild diff --git a/dev-python/survey/Manifest b/dev-python/survey/Manifest index 39b9b44439..dc28c100d8 100644 --- a/dev-python/survey/Manifest +++ b/dev-python/survey/Manifest @@ -1,2 +1,3 @@ DIST survey-3.4.3.tar.gz 21219 BLAKE2B e866addd9233409c603f2b34bbf811209f3f6c2ade1bee00258c4f25d741dc526948d16b2e9e0dc3632e6e20fa7863f573c4c27ed1f48ddaa954c7d53a8c51e3 SHA512 47ff72dd1223a32ec038ccf57709e8fe64806ecc9bb8e54daaced27afaa1c2a45e76fc1b149232a107729c462db7657ad0fd08d8b14bb314e3905aabd23fff4a DIST survey-4.5.3.tar.gz 831058 BLAKE2B 0aa03304749cf92aa6a86f903eecedf955a27dbaeb0e36258fe23fbfe1def435f702b4b55aadef14a3b195dff523c0ea1ae4fbc31faffcbe0f6ec0034b9b4901 SHA512 380174a7f2ece919c4e716f3d4a8b2e4fc011b0d29149d7c08b9696e748c243f4be5773997f11964af3c3685f10c239eceb270b5efaeb6dfe51226b4169cb885 +DIST survey-4.5.4.tar.gz 831109 BLAKE2B 00065211437f4c6c820aca5c511395625da7be9415218d6261005aff946b19a3e65cc31189a6aef755ed88ce81f309ac2eabe23ea7f1e2f359007b4fe9172f96 SHA512 045989ca95e3fa9a840ad8d37a040f46bf3f22a858dd7b826fecf88d4e53b6b14e285ef3bf266add496da2d5ffd58971c2456b4375362e24c1a071fc910a03f4 diff --git a/dev-python/survey/survey-4.5.4.ebuild b/dev-python/survey/survey-4.5.4.ebuild new file mode 100644 index 0000000000..5394b397dc --- /dev/null +++ b/dev-python/survey/survey-4.5.4.ebuild @@ -0,0 +1,23 @@ +# Copyright 2021-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 pypi + +DESCRIPTION="A simple library for creating beautiful interactive prompts" +HOMEPAGE=" + https://github.com/Exahilosys/survey + https://pypi.org/project/survey/ +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +distutils_enable_sphinx docs \ + dev-python/sphinx-autodoc-typehints \ + dev-python/sphinx-paramlinks \ + dev-python/sphinx-rtd-theme From f5990aa88ea05c6ec82ecc5b70d9c3fa255b931f Mon Sep 17 00:00:00 2001 From: Viorel Munteanu Date: Tue, 25 Jul 2023 10:01:42 +0300 Subject: [PATCH 3/6] dev-python/survey: drop 4.5.3 Signed-off-by: Viorel Munteanu --- dev-python/survey/Manifest | 1 - dev-python/survey/survey-4.5.3.ebuild | 23 ----------------------- 2 files changed, 24 deletions(-) delete mode 100644 dev-python/survey/survey-4.5.3.ebuild diff --git a/dev-python/survey/Manifest b/dev-python/survey/Manifest index dc28c100d8..c55c753f84 100644 --- a/dev-python/survey/Manifest +++ b/dev-python/survey/Manifest @@ -1,3 +1,2 @@ DIST survey-3.4.3.tar.gz 21219 BLAKE2B e866addd9233409c603f2b34bbf811209f3f6c2ade1bee00258c4f25d741dc526948d16b2e9e0dc3632e6e20fa7863f573c4c27ed1f48ddaa954c7d53a8c51e3 SHA512 47ff72dd1223a32ec038ccf57709e8fe64806ecc9bb8e54daaced27afaa1c2a45e76fc1b149232a107729c462db7657ad0fd08d8b14bb314e3905aabd23fff4a -DIST survey-4.5.3.tar.gz 831058 BLAKE2B 0aa03304749cf92aa6a86f903eecedf955a27dbaeb0e36258fe23fbfe1def435f702b4b55aadef14a3b195dff523c0ea1ae4fbc31faffcbe0f6ec0034b9b4901 SHA512 380174a7f2ece919c4e716f3d4a8b2e4fc011b0d29149d7c08b9696e748c243f4be5773997f11964af3c3685f10c239eceb270b5efaeb6dfe51226b4169cb885 DIST survey-4.5.4.tar.gz 831109 BLAKE2B 00065211437f4c6c820aca5c511395625da7be9415218d6261005aff946b19a3e65cc31189a6aef755ed88ce81f309ac2eabe23ea7f1e2f359007b4fe9172f96 SHA512 045989ca95e3fa9a840ad8d37a040f46bf3f22a858dd7b826fecf88d4e53b6b14e285ef3bf266add496da2d5ffd58971c2456b4375362e24c1a071fc910a03f4 diff --git a/dev-python/survey/survey-4.5.3.ebuild b/dev-python/survey/survey-4.5.3.ebuild deleted file mode 100644 index 5394b397dc..0000000000 --- a/dev-python/survey/survey-4.5.3.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 2021-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 pypi - -DESCRIPTION="A simple library for creating beautiful interactive prompts" -HOMEPAGE=" - https://github.com/Exahilosys/survey - https://pypi.org/project/survey/ -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -distutils_enable_sphinx docs \ - dev-python/sphinx-autodoc-typehints \ - dev-python/sphinx-paramlinks \ - dev-python/sphinx-rtd-theme From c38410b85fee6550987443ee45c43b398ecc279b Mon Sep 17 00:00:00 2001 From: Viorel Munteanu Date: Tue, 25 Jul 2023 10:39:12 +0300 Subject: [PATCH 4/6] net-misc/maestral: add 1.8.0 Signed-off-by: Viorel Munteanu --- net-misc/maestral/Manifest | 1 + net-misc/maestral/maestral-1.8.0.ebuild | 54 +++++++++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 net-misc/maestral/maestral-1.8.0.ebuild diff --git a/net-misc/maestral/Manifest b/net-misc/maestral/Manifest index eddad79bd1..a0953d9ccc 100644 --- a/net-misc/maestral/Manifest +++ b/net-misc/maestral/Manifest @@ -1,2 +1,3 @@ DIST maestral-1.7.3.gh.tar.gz 8124324 BLAKE2B 793ff423e356da1dd17fa9815a635b0d57e7665eb3024e9b2b8a30c3e37868b942de3ddeec66a5c76172c9c9635a5646f9ccb302397a5f318ed30df8898a24a5 SHA512 93d4ec06a0a612ecd270deb7b92a8d9e4895db0e835430569b46f09a2fd3a83af89dceffd52b3f2be2b0417a7a88700732412556ce1224a14d62226727daa0c1 +DIST maestral-1.8.0.gh.tar.gz 8125310 BLAKE2B 14880a6ced1d1cea203741875f4eb4a8520daf7103efaca19476c21674f9a10edc2d8959d86fc916ba2cbafbca4e33dd393986f08e844b0e7f85d1c833ea7af6 SHA512 e6dff6b8685e78f10ea03b88cfc3d307d0a5873935b43cf4e04c5876009ca1ce88aa782da37a17b9ea092335a3835f2fe2fbf388c861c5da36500a781d10a17b DIST maestral-1.8.0_rc0.gh.tar.gz 8125327 BLAKE2B e019b08b78bac352152dbddadadfa3da74db4d962ad83b7a4789999becdfc35c7aa6ec1af243a461207525bae8f207c5dcb8285e6f5c5f4c681b30998a65248e SHA512 bcea5b58fab9a1d78d8566fc8be0e6fd7fea2bc942d96659821ce3bdfd0edd6927826abbc46d717e971c612414919b5e8e6a21c57627780c13f932eae9cd35b4 diff --git a/net-misc/maestral/maestral-1.8.0.ebuild b/net-misc/maestral/maestral-1.8.0.ebuild new file mode 100644 index 0000000000..772464ac1d --- /dev/null +++ b/net-misc/maestral/maestral-1.8.0.ebuild @@ -0,0 +1,54 @@ +# Copyright 2021-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 xdg + +MY_PV=${PV/_rc/.dev} +DESCRIPTION="Maestral is an open-source Dropbox client written in Python" +HOMEPAGE="https://maestral.app" +SRC_URI="https://github.com/samschott/maestral/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz" +S="${WORKDIR}"/${PN}-${MY_PV} + +LICENSE="MIT" +SLOT="0" +if [[ ${PV} != *_rc* ]]; then + KEYWORDS="~amd64" +fi + +RDEPEND=" + >=dev-python/click-8.0.2[${PYTHON_USEDEP}] + >=dev-python/desktop-notifier-3.3.0[${PYTHON_USEDEP}] + =dev-python/dropbox-11*[${PYTHON_USEDEP}] + >=dev-python/fasteners-0.15[${PYTHON_USEDEP}] + dev-python/importlib-metadata[${PYTHON_USEDEP}] + >=dev-python/keyring-22.0.0[${PYTHON_USEDEP}] + >=dev-python/keyrings-alt-3.1.0[${PYTHON_USEDEP}] + dev-python/packaging[${PYTHON_USEDEP}] + >=dev-python/pathspec-0.5.8[${PYTHON_USEDEP}] + >=dev-python/Pyro5-5.10[${PYTHON_USEDEP}] + >=dev-python/requests-2.16.2[${PYTHON_USEDEP}] + dev-python/rich[${PYTHON_USEDEP}] + =dev-python/survey-4*[${PYTHON_USEDEP}] + dev-python/typing-extensions[${PYTHON_USEDEP}] + >=dev-python/watchdog-2.0.1[${PYTHON_USEDEP}] +" +BDEPEND=" + dev-python/build[${PYTHON_USEDEP}] +" + +EPYTEST_DESELECT=( + # requires dev-python/pytest-benchmark not available for py3.11 + tests/offline/test_clean_local_events.py::test_performance + + # requires systemd + tests/offline/test_cli.py::test_autostart + + # requires network + tests/offline/test_main.py::test_check_for_updates +) + +distutils_enable_tests pytest From b3d0eec4748d3a2ff3c83f075a603b24a694766a Mon Sep 17 00:00:00 2001 From: Viorel Munteanu Date: Tue, 25 Jul 2023 10:39:18 +0300 Subject: [PATCH 5/6] net-misc/maestral: drop 1.8.0_rc0 Signed-off-by: Viorel Munteanu --- net-misc/maestral/Manifest | 1 - net-misc/maestral/maestral-1.8.0_rc0.ebuild | 54 --------------------- 2 files changed, 55 deletions(-) delete mode 100644 net-misc/maestral/maestral-1.8.0_rc0.ebuild diff --git a/net-misc/maestral/Manifest b/net-misc/maestral/Manifest index a0953d9ccc..e980d0dcb7 100644 --- a/net-misc/maestral/Manifest +++ b/net-misc/maestral/Manifest @@ -1,3 +1,2 @@ DIST maestral-1.7.3.gh.tar.gz 8124324 BLAKE2B 793ff423e356da1dd17fa9815a635b0d57e7665eb3024e9b2b8a30c3e37868b942de3ddeec66a5c76172c9c9635a5646f9ccb302397a5f318ed30df8898a24a5 SHA512 93d4ec06a0a612ecd270deb7b92a8d9e4895db0e835430569b46f09a2fd3a83af89dceffd52b3f2be2b0417a7a88700732412556ce1224a14d62226727daa0c1 DIST maestral-1.8.0.gh.tar.gz 8125310 BLAKE2B 14880a6ced1d1cea203741875f4eb4a8520daf7103efaca19476c21674f9a10edc2d8959d86fc916ba2cbafbca4e33dd393986f08e844b0e7f85d1c833ea7af6 SHA512 e6dff6b8685e78f10ea03b88cfc3d307d0a5873935b43cf4e04c5876009ca1ce88aa782da37a17b9ea092335a3835f2fe2fbf388c861c5da36500a781d10a17b -DIST maestral-1.8.0_rc0.gh.tar.gz 8125327 BLAKE2B e019b08b78bac352152dbddadadfa3da74db4d962ad83b7a4789999becdfc35c7aa6ec1af243a461207525bae8f207c5dcb8285e6f5c5f4c681b30998a65248e SHA512 bcea5b58fab9a1d78d8566fc8be0e6fd7fea2bc942d96659821ce3bdfd0edd6927826abbc46d717e971c612414919b5e8e6a21c57627780c13f932eae9cd35b4 diff --git a/net-misc/maestral/maestral-1.8.0_rc0.ebuild b/net-misc/maestral/maestral-1.8.0_rc0.ebuild deleted file mode 100644 index 772464ac1d..0000000000 --- a/net-misc/maestral/maestral-1.8.0_rc0.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 2021-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 xdg - -MY_PV=${PV/_rc/.dev} -DESCRIPTION="Maestral is an open-source Dropbox client written in Python" -HOMEPAGE="https://maestral.app" -SRC_URI="https://github.com/samschott/maestral/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz" -S="${WORKDIR}"/${PN}-${MY_PV} - -LICENSE="MIT" -SLOT="0" -if [[ ${PV} != *_rc* ]]; then - KEYWORDS="~amd64" -fi - -RDEPEND=" - >=dev-python/click-8.0.2[${PYTHON_USEDEP}] - >=dev-python/desktop-notifier-3.3.0[${PYTHON_USEDEP}] - =dev-python/dropbox-11*[${PYTHON_USEDEP}] - >=dev-python/fasteners-0.15[${PYTHON_USEDEP}] - dev-python/importlib-metadata[${PYTHON_USEDEP}] - >=dev-python/keyring-22.0.0[${PYTHON_USEDEP}] - >=dev-python/keyrings-alt-3.1.0[${PYTHON_USEDEP}] - dev-python/packaging[${PYTHON_USEDEP}] - >=dev-python/pathspec-0.5.8[${PYTHON_USEDEP}] - >=dev-python/Pyro5-5.10[${PYTHON_USEDEP}] - >=dev-python/requests-2.16.2[${PYTHON_USEDEP}] - dev-python/rich[${PYTHON_USEDEP}] - =dev-python/survey-4*[${PYTHON_USEDEP}] - dev-python/typing-extensions[${PYTHON_USEDEP}] - >=dev-python/watchdog-2.0.1[${PYTHON_USEDEP}] -" -BDEPEND=" - dev-python/build[${PYTHON_USEDEP}] -" - -EPYTEST_DESELECT=( - # requires dev-python/pytest-benchmark not available for py3.11 - tests/offline/test_clean_local_events.py::test_performance - - # requires systemd - tests/offline/test_cli.py::test_autostart - - # requires network - tests/offline/test_main.py::test_check_for_updates -) - -distutils_enable_tests pytest From 490770823556d5d2dd4318508c7841c19bb6d35d Mon Sep 17 00:00:00 2001 From: Viorel Munteanu Date: Tue, 25 Jul 2023 10:47:54 +0300 Subject: [PATCH 6/6] net-misc/maestral-qt: add 1.8.0 Signed-off-by: Viorel Munteanu --- net-misc/maestral-qt/Manifest | 1 + net-misc/maestral-qt/maestral-qt-1.8.0.ebuild | 37 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 net-misc/maestral-qt/maestral-qt-1.8.0.ebuild diff --git a/net-misc/maestral-qt/Manifest b/net-misc/maestral-qt/Manifest index c2fec8ebbf..d9eb392627 100644 --- a/net-misc/maestral-qt/Manifest +++ b/net-misc/maestral-qt/Manifest @@ -1 +1,2 @@ DIST maestral-qt-1.7.3.gh.tar.gz 1219548 BLAKE2B 9feabc6b87ee5d879346233ac45b2ee286186203451f9d3d1a9f2817a4339021b18ebf698f9414dba8ea84088ebfbdf598e1c94c59b7a6bd96bfe287a5e27749 SHA512 c6e7bcf4b2856d7a26ab99ff2d4bbf7917312e6ccbb212ee948ec35dece1a67ff87c60ee81dcebe53ac541ffe3c009104a956ded9b3c915695629b8ef4974acc +DIST maestral-qt-1.8.0.gh.tar.gz 1219570 BLAKE2B 83c3d67b169f04553f3885e3ae008fe04284bb9fd9a7b2888e2146e298e85cc15f639d83359165a957f8832bb34d3bf129ddd850d58b6e808e257d5784a2e1b4 SHA512 2cf19185fce01b5d1884215522987ba77484e6d6cb9a3745503fd2bc66c796db839ee7dc863fb3b8e3b55b95af013bf23b00bc60cb7106d265766ca813482bdd diff --git a/net-misc/maestral-qt/maestral-qt-1.8.0.ebuild b/net-misc/maestral-qt/maestral-qt-1.8.0.ebuild new file mode 100644 index 0000000000..f9462a0bb4 --- /dev/null +++ b/net-misc/maestral-qt/maestral-qt-1.8.0.ebuild @@ -0,0 +1,37 @@ +# Copyright 2021-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 desktop distutils-r1 + +MY_PV=${PV/_rc/.dev} +DESCRIPTION="Maestral is an open-source Dropbox client written in Python" +HOMEPAGE="https://maestral.app" +SRC_URI="https://github.com/samschott/${PN}/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz" +S="${WORKDIR}"/${PN}-${MY_PV} + +LICENSE="MIT" +SLOT="0" +if [[ ${PV} != *_rc* ]]; then + KEYWORDS="~amd64" +fi + +RDEPEND=" + >=dev-python/click-8.0.2[${PYTHON_USEDEP}] + dev-python/markdown2[${PYTHON_USEDEP}] + dev-python/packaging[${PYTHON_USEDEP}] + dev-python/PyQt6[widgets,gui,svg,${PYTHON_USEDEP}] + >=net-misc/maestral-${PV%_rc*}_rc0[${PYTHON_USEDEP}] +" +BDEPEND=" + dev-python/build[${PYTHON_USEDEP}] +" + +python_install_all() { + distutils-r1_python_install_all + + domenu src/maestral_qt/resources/maestral.desktop +}