commit: 6472bedae5a9dd360bb02793043fd93e8635ae87 Author: Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch> AuthorDate: Sat Feb 25 16:48:10 2023 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sun Feb 26 03:59:52 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6472beda
media-gfx/hydrus: Add 518, 9999 with support for python 3.11 Closes: https://bugs.gentoo.org/896986 Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch> Closes: https://github.com/gentoo/gentoo/pull/29790 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> media-gfx/hydrus/Manifest | 2 ++ media-gfx/hydrus/{hydrus-9999.ebuild => hydrus-518.ebuild} | 10 +++++++--- media-gfx/hydrus/hydrus-9999.ebuild | 10 +++++++--- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest index 9156132cd366..37c23f2511ad 100644 --- a/media-gfx/hydrus/Manifest +++ b/media-gfx/hydrus/Manifest @@ -1 +1,3 @@ +DIST hydrus-3.11-test-fixes.patch 8493 BLAKE2B 598c9a82ced8c181ac2c9f91bef34ad9136444f40d909a69c0c0d3a5f620bb2818a684ed221ae62f1e6226d6b534b6ac06cedb3f65a5f3be8fc2b12612a9daad SHA512 6dd8206b02f5f209cf86d2b8cd65952cc3d449352d3cb91c654d325077306415e6482191a4e64cba6aec2c4f1ff358c01e2ecbe7d3b56c9027673757a3590051 DIST hydrus-516.tar.gz 41098992 BLAKE2B 4195ade87f9f42f5aaf592ae502e49404d3fb188f7921c137973e7df31af8bb346c243a375e99014cfa9e3d6821a187b254cfe79f88c470cf54aa45e50e9bb22 SHA512 941cb81fba305708a1c33250aae366ae3bf8ba83d9aab90475bec09109608c86b68fdcc84d18a4fe324f57b2b91b8531887d9792b9d9130c5234f9cfa96e106f +DIST hydrus-518.tar.gz 41105373 BLAKE2B e766cdb7e8ffdc1148f5970724a6d3293522a0ae750c4e5c996d5cdbabc837dc3a9c002251080b6253a869b2cf87a17cb9c7b99ad912d68b6b5c4207e1d3ae7a SHA512 7e551ba83e97b490c98bf1858b87c78e9d5564cfaecfc83426ad2d802005e7cb84c9aadc61b762f3dca1916b8e786ca044bb310c93462e4c4f953f60f3291ed2 diff --git a/media-gfx/hydrus/hydrus-9999.ebuild b/media-gfx/hydrus/hydrus-518.ebuild similarity index 91% copy from media-gfx/hydrus/hydrus-9999.ebuild copy to media-gfx/hydrus/hydrus-518.ebuild index e447f565f37b..072c47dfe381 100644 --- a/media-gfx/hydrus/hydrus-9999.ebuild +++ b/media-gfx/hydrus/hydrus-518.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE="sqlite" DOCS_BUILDER=mkdocs @@ -18,8 +18,12 @@ if [[ "${PV}" == "9999" ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"; + SRC_URI="https://github.com/vaartis/hydrus/commit/106a55b3aca945d047685eb53bd1d2aa8b8a7c50.diff -> ${PN}-3.11-test-fixes.patch" else - SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI=" + https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/vaartis/hydrus/commit/106a55b3aca945d047685eb53bd1d2aa8b8a7c50.diff -> ${PN}-3.11-test-fixes.patch + " KEYWORDS="~amd64" fi @@ -58,7 +62,6 @@ RDEPEND=" dev-python/twisted[${PYTHON_USEDEP}] media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}] media-video/ffmpeg - media-video/mpv[libmpv,${PYTHON_USEDEP}] >=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}] dev-python/beautifulsoup4[${PYTHON_USEDEP}] @@ -76,6 +79,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/userpath-in-local-share.patch" + "${DISTDIR}/${PN}-3.11-test-fixes.patch" ) src_prepare() { diff --git a/media-gfx/hydrus/hydrus-9999.ebuild b/media-gfx/hydrus/hydrus-9999.ebuild index e447f565f37b..072c47dfe381 100644 --- a/media-gfx/hydrus/hydrus-9999.ebuild +++ b/media-gfx/hydrus/hydrus-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE="sqlite" DOCS_BUILDER=mkdocs @@ -18,8 +18,12 @@ if [[ "${PV}" == "9999" ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"; + SRC_URI="https://github.com/vaartis/hydrus/commit/106a55b3aca945d047685eb53bd1d2aa8b8a7c50.diff -> ${PN}-3.11-test-fixes.patch" else - SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI=" + https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/vaartis/hydrus/commit/106a55b3aca945d047685eb53bd1d2aa8b8a7c50.diff -> ${PN}-3.11-test-fixes.patch + " KEYWORDS="~amd64" fi @@ -58,7 +62,6 @@ RDEPEND=" dev-python/twisted[${PYTHON_USEDEP}] media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}] media-video/ffmpeg - media-video/mpv[libmpv,${PYTHON_USEDEP}] >=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}] dev-python/beautifulsoup4[${PYTHON_USEDEP}] @@ -76,6 +79,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/userpath-in-local-share.patch" + "${DISTDIR}/${PN}-3.11-test-fixes.patch" ) src_prepare() {
