public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2021-06-02 19:47 Michał Górny
  0 siblings, 0 replies; 104+ messages in thread
From: Michał Górny @ 2021-06-02 19:47 UTC (permalink / raw
  To: gentoo-commits

commit:     ed628138b5bbc2513c740ede338671bf427ce23b
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Wed Jun  2 15:16:05 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun  2 19:46:49 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed628138

media-gfx/hydrus: Bump to python 3.9

Now that QtPy and Pyside2 support 3.9, this does too

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://github.com/gentoo/gentoo/pull/21087
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 media-gfx/hydrus/hydrus-441.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/hydrus/hydrus-441.ebuild b/media-gfx/hydrus/hydrus-441.ebuild
index ae3f806847c..2e6f4152ae7 100644
--- a/media-gfx/hydrus/hydrus-441.ebuild
+++ b/media-gfx/hydrus/hydrus-441.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..8} )
+PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE="sqlite"
 
 inherit python-single-r1 desktop optfeature


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2021-06-11 21:29 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2021-06-11 21:29 UTC (permalink / raw
  To: gentoo-commits

commit:     f1f4fa13c95f537afd0f497eae1aa5e61893d34c
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Fri Jun 11 08:49:16 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 11 08:49:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1f4fa13

media-gfx/hydrus: Add 9999

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://github.com/gentoo/gentoo/pull/21182
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/hydrus-9999.ebuild | 144 ++++++++++++++++++++++++++++++++++++
 1 file changed, 144 insertions(+)

diff --git a/media-gfx/hydrus/hydrus-9999.ebuild b/media-gfx/hydrus/hydrus-9999.ebuild
new file mode 100644
index 00000000000..d51d23e32a5
--- /dev/null
+++ b/media-gfx/hydrus/hydrus-9999.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="sqlite"
+
+inherit python-single-r1 desktop optfeature
+
+DESCRIPTION="A booru-like media organizer for the desktop"
+HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
+
+if [ "${PV}" == "9999" ]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
+else
+	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+# hydrus itself is WTFPL
+# icons included are CC-BY-2.5
+LICENSE="WTFPL-2 CC-BY-2.5"
+SLOT="0"
+IUSE="+mpv +ffmpeg +lz4 socks +cloudscraper charts test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+		dev-python/html5lib[${PYTHON_MULTI_USEDEP}]
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/psutil[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyside2[widgets,gui,charts?,${PYTHON_MULTI_USEDEP}]
+		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
+		dev-python/service_identity[${PYTHON_MULTI_USEDEP}]
+		dev-python/six[${PYTHON_MULTI_USEDEP}]
+		dev-python/twisted[${PYTHON_MULTI_USEDEP}]
+		media-libs/opencv[python,png,jpeg,${PYTHON_MULTI_USEDEP}]
+
+		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_MULTI_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+
+		cloudscraper? ( dev-python/cloudscraper[${PYTHON_MULTI_USEDEP}] )
+		ffmpeg? ( media-video/ffmpeg )
+		lz4? ( dev-python/lz4[${PYTHON_MULTI_USEDEP}] )
+		mpv? (
+			media-video/mpv[libmpv,${PYTHON_MULTI_USEDEP}]
+			dev-python/python-mpv[${PYTHON_MULTI_USEDEP}]
+		)
+		socks? (
+			|| ( dev-python/requests[socks5,${PYTHON_MULTI_USEDEP}]
+				dev-python/PySocks[${PYTHON_MULTI_USEDEP}] )
+		)
+	')
+"
+BDEPEND="
+	${RDEPEND}
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/httmock[${PYTHON_MULTI_USEDEP}]
+			dev-python/mock[${PYTHON_MULTI_USEDEP}]
+			dev-python/nose[${PYTHON_MULTI_USEDEP}]
+			dev-python/unittest2[${PYTHON_MULTI_USEDEP}]
+		)
+	')
+"
+
+PATCHES=(
+	"${FILESDIR}/upnpc.patch"
+	"${FILESDIR}/userpath-in-local-share.patch"
+	"${FILESDIR}/test-exitcode.patch"
+)
+
+src_prepare() {
+	default
+
+	# Contains pre-built binaries for other systems and a broken swf renderer for linux
+	rm -r bin/ || die
+	# Build files used for CI, not actually needed
+	rm -r static/build_files || die
+	# Duplicate license file, not needed
+	rm license.txt || die
+	# Python requirements files, not needed
+	rm requirements_*.txt || die
+}
+
+src_compile() {
+	python_optimize "${S}"
+}
+
+src_test() {
+	# The tests use unittest, but are run with a custom runner script.
+	# QT_QPA_PLATFORM is required to make them run without X
+	local -x QT_QPA_PLATFORM=offscreen
+	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
+}
+
+src_install() {
+	local doc="${EPREFIX}/usr/share/doc/${PF}"
+	elog "Hydrus includes an excellent manual, that can either be viewed at"
+	elog "${doc}/html/help/index.html"
+	elog "or accessed through the hydrus help menu."
+
+	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
+
+	local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/)
+	local HTML_DOCS=("${S}"/help/)
+	einstalldocs
+
+	# Files only needed for testing
+	rm test.py hydrus/hydrus_test.py || die
+	rm -r hydrus/test/ static/testing/ || die
+
+	# These files are copied into doc
+	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
+	# The program expects to find documentation here, so add a symlink to doc
+	ln -s "${doc}/html/help" help || die
+
+	insinto /opt/hydrus
+	doins -r "${S}"/.
+
+	exeinto /usr/bin
+	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server")
+	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client")
+
+	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
+					   "AudioVideo;FileTools;Graphics;Network;"
+}
+
+pkg_postinst() {
+	optfeature "support for automatic port forwarding" "net-libs/miniupnpc"
+}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2021-06-11 21:29 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2021-06-11 21:29 UTC (permalink / raw
  To: gentoo-commits

commit:     c724950380f3f86365f9d9aeea572b5a891e1b6b
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Thu Jun 10 08:11:05 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 11 08:49:41 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7249503

media-gfx/hydrus: Add version 443

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/Manifest          |   1 +
 media-gfx/hydrus/hydrus-443.ebuild | 144 +++++++++++++++++++++++++++++++++++++
 2 files changed, 145 insertions(+)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 667917701ae..9d7b78394ff 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,2 +1,3 @@
 DIST hydrus-441.tar.gz 38807432 BLAKE2B e8294a8eb4d808792f2ff50ad4776f078ba1003962b065883ec22fd68f46dc250b2bccf47005731fcc964b75e07977aed45023da1c7e4513fcfcc29d1b4d1a97 SHA512 81eeb59006644b9b33c33c8da3e003640116488509ce2e1426d2a5c0161adf208e31a45c2a5efc2902769bf91e3db56aabc6384f77e8354e0e113bcc6df3a131
 DIST hydrus-442.tar.gz 38818985 BLAKE2B 955f5d9969bd46184fbf5fb11b1bc17257d184acd34a9533a20bc35e20ff5cabcc3715ebbb39f42b926b8b00f570c7f483eed3b11472c78f82b9ceeafc3dc765 SHA512 5a78338426127b276b067b52f590e275e132ea2676a4933162183e183a015556351e13e55271240059a145627d8a2ce1f6fe1a07ef267580604e998328c5c4f6
+DIST hydrus-443.tar.gz 38823767 BLAKE2B 100b2c0650d3230b1c18e58417b731bd661fecde50ac43010bcffe3f8f5be5e0416156523a2c3b5bcc4d739a54f3c6cf21559a2be2ba1dd6fe38131d91d00bee SHA512 d18f32c2cb05ab73dcff83d1a7bad63519b84640cce2991f00623da86197ecf72ac4f3c1e064515980a56d2c415dcb90e19edeb35646701bca0f3fc0d149be1d

diff --git a/media-gfx/hydrus/hydrus-443.ebuild b/media-gfx/hydrus/hydrus-443.ebuild
new file mode 100644
index 00000000000..d51d23e32a5
--- /dev/null
+++ b/media-gfx/hydrus/hydrus-443.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="sqlite"
+
+inherit python-single-r1 desktop optfeature
+
+DESCRIPTION="A booru-like media organizer for the desktop"
+HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
+
+if [ "${PV}" == "9999" ]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
+else
+	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+# hydrus itself is WTFPL
+# icons included are CC-BY-2.5
+LICENSE="WTFPL-2 CC-BY-2.5"
+SLOT="0"
+IUSE="+mpv +ffmpeg +lz4 socks +cloudscraper charts test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+		dev-python/html5lib[${PYTHON_MULTI_USEDEP}]
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/psutil[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyside2[widgets,gui,charts?,${PYTHON_MULTI_USEDEP}]
+		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
+		dev-python/service_identity[${PYTHON_MULTI_USEDEP}]
+		dev-python/six[${PYTHON_MULTI_USEDEP}]
+		dev-python/twisted[${PYTHON_MULTI_USEDEP}]
+		media-libs/opencv[python,png,jpeg,${PYTHON_MULTI_USEDEP}]
+
+		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_MULTI_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+
+		cloudscraper? ( dev-python/cloudscraper[${PYTHON_MULTI_USEDEP}] )
+		ffmpeg? ( media-video/ffmpeg )
+		lz4? ( dev-python/lz4[${PYTHON_MULTI_USEDEP}] )
+		mpv? (
+			media-video/mpv[libmpv,${PYTHON_MULTI_USEDEP}]
+			dev-python/python-mpv[${PYTHON_MULTI_USEDEP}]
+		)
+		socks? (
+			|| ( dev-python/requests[socks5,${PYTHON_MULTI_USEDEP}]
+				dev-python/PySocks[${PYTHON_MULTI_USEDEP}] )
+		)
+	')
+"
+BDEPEND="
+	${RDEPEND}
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/httmock[${PYTHON_MULTI_USEDEP}]
+			dev-python/mock[${PYTHON_MULTI_USEDEP}]
+			dev-python/nose[${PYTHON_MULTI_USEDEP}]
+			dev-python/unittest2[${PYTHON_MULTI_USEDEP}]
+		)
+	')
+"
+
+PATCHES=(
+	"${FILESDIR}/upnpc.patch"
+	"${FILESDIR}/userpath-in-local-share.patch"
+	"${FILESDIR}/test-exitcode.patch"
+)
+
+src_prepare() {
+	default
+
+	# Contains pre-built binaries for other systems and a broken swf renderer for linux
+	rm -r bin/ || die
+	# Build files used for CI, not actually needed
+	rm -r static/build_files || die
+	# Duplicate license file, not needed
+	rm license.txt || die
+	# Python requirements files, not needed
+	rm requirements_*.txt || die
+}
+
+src_compile() {
+	python_optimize "${S}"
+}
+
+src_test() {
+	# The tests use unittest, but are run with a custom runner script.
+	# QT_QPA_PLATFORM is required to make them run without X
+	local -x QT_QPA_PLATFORM=offscreen
+	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
+}
+
+src_install() {
+	local doc="${EPREFIX}/usr/share/doc/${PF}"
+	elog "Hydrus includes an excellent manual, that can either be viewed at"
+	elog "${doc}/html/help/index.html"
+	elog "or accessed through the hydrus help menu."
+
+	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
+
+	local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/)
+	local HTML_DOCS=("${S}"/help/)
+	einstalldocs
+
+	# Files only needed for testing
+	rm test.py hydrus/hydrus_test.py || die
+	rm -r hydrus/test/ static/testing/ || die
+
+	# These files are copied into doc
+	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
+	# The program expects to find documentation here, so add a symlink to doc
+	ln -s "${doc}/html/help" help || die
+
+	insinto /opt/hydrus
+	doins -r "${S}"/.
+
+	exeinto /usr/bin
+	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server")
+	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client")
+
+	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
+					   "AudioVideo;FileTools;Graphics;Network;"
+}
+
+pkg_postinst() {
+	optfeature "support for automatic port forwarding" "net-libs/miniupnpc"
+}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2021-06-29  4:40 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2021-06-29  4:40 UTC (permalink / raw
  To: gentoo-commits

commit:     e5f819219d84e4ca3a4668359dfd2d28ecd6afd7
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Thu Jun 24 17:46:14 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 29 04:11:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5f81921

media-gfx/hydrus: Add version 444

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://github.com/gentoo/gentoo/pull/21410
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/Manifest          |   1 +
 media-gfx/hydrus/hydrus-444.ebuild | 144 +++++++++++++++++++++++++++++++++++++
 2 files changed, 145 insertions(+)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 9d7b78394ff..310a331fafb 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,3 +1,4 @@
 DIST hydrus-441.tar.gz 38807432 BLAKE2B e8294a8eb4d808792f2ff50ad4776f078ba1003962b065883ec22fd68f46dc250b2bccf47005731fcc964b75e07977aed45023da1c7e4513fcfcc29d1b4d1a97 SHA512 81eeb59006644b9b33c33c8da3e003640116488509ce2e1426d2a5c0161adf208e31a45c2a5efc2902769bf91e3db56aabc6384f77e8354e0e113bcc6df3a131
 DIST hydrus-442.tar.gz 38818985 BLAKE2B 955f5d9969bd46184fbf5fb11b1bc17257d184acd34a9533a20bc35e20ff5cabcc3715ebbb39f42b926b8b00f570c7f483eed3b11472c78f82b9ceeafc3dc765 SHA512 5a78338426127b276b067b52f590e275e132ea2676a4933162183e183a015556351e13e55271240059a145627d8a2ce1f6fe1a07ef267580604e998328c5c4f6
 DIST hydrus-443.tar.gz 38823767 BLAKE2B 100b2c0650d3230b1c18e58417b731bd661fecde50ac43010bcffe3f8f5be5e0416156523a2c3b5bcc4d739a54f3c6cf21559a2be2ba1dd6fe38131d91d00bee SHA512 d18f32c2cb05ab73dcff83d1a7bad63519b84640cce2991f00623da86197ecf72ac4f3c1e064515980a56d2c415dcb90e19edeb35646701bca0f3fc0d149be1d
+DIST hydrus-444.tar.gz 38817103 BLAKE2B f9eb3dc346a1a7b8d45558ee69b0b9d2a7dbbb7018734680e9953f20ebd56209cc1874213ecf5515835f1022bf571a99543154843f7dc2b9375116db8ba080a0 SHA512 f5bc28e43a5218fce15bc9d197ebcc1f4eb47856a741ad79f59d1da2413a3e7e220381a4d8208fe880fa507e023f9c03050e46ab5214ef310d105df0d85a9682

diff --git a/media-gfx/hydrus/hydrus-444.ebuild b/media-gfx/hydrus/hydrus-444.ebuild
new file mode 100644
index 00000000000..d51d23e32a5
--- /dev/null
+++ b/media-gfx/hydrus/hydrus-444.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="sqlite"
+
+inherit python-single-r1 desktop optfeature
+
+DESCRIPTION="A booru-like media organizer for the desktop"
+HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
+
+if [ "${PV}" == "9999" ]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
+else
+	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+# hydrus itself is WTFPL
+# icons included are CC-BY-2.5
+LICENSE="WTFPL-2 CC-BY-2.5"
+SLOT="0"
+IUSE="+mpv +ffmpeg +lz4 socks +cloudscraper charts test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+		dev-python/html5lib[${PYTHON_MULTI_USEDEP}]
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/psutil[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyside2[widgets,gui,charts?,${PYTHON_MULTI_USEDEP}]
+		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
+		dev-python/service_identity[${PYTHON_MULTI_USEDEP}]
+		dev-python/six[${PYTHON_MULTI_USEDEP}]
+		dev-python/twisted[${PYTHON_MULTI_USEDEP}]
+		media-libs/opencv[python,png,jpeg,${PYTHON_MULTI_USEDEP}]
+
+		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_MULTI_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+
+		cloudscraper? ( dev-python/cloudscraper[${PYTHON_MULTI_USEDEP}] )
+		ffmpeg? ( media-video/ffmpeg )
+		lz4? ( dev-python/lz4[${PYTHON_MULTI_USEDEP}] )
+		mpv? (
+			media-video/mpv[libmpv,${PYTHON_MULTI_USEDEP}]
+			dev-python/python-mpv[${PYTHON_MULTI_USEDEP}]
+		)
+		socks? (
+			|| ( dev-python/requests[socks5,${PYTHON_MULTI_USEDEP}]
+				dev-python/PySocks[${PYTHON_MULTI_USEDEP}] )
+		)
+	')
+"
+BDEPEND="
+	${RDEPEND}
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/httmock[${PYTHON_MULTI_USEDEP}]
+			dev-python/mock[${PYTHON_MULTI_USEDEP}]
+			dev-python/nose[${PYTHON_MULTI_USEDEP}]
+			dev-python/unittest2[${PYTHON_MULTI_USEDEP}]
+		)
+	')
+"
+
+PATCHES=(
+	"${FILESDIR}/upnpc.patch"
+	"${FILESDIR}/userpath-in-local-share.patch"
+	"${FILESDIR}/test-exitcode.patch"
+)
+
+src_prepare() {
+	default
+
+	# Contains pre-built binaries for other systems and a broken swf renderer for linux
+	rm -r bin/ || die
+	# Build files used for CI, not actually needed
+	rm -r static/build_files || die
+	# Duplicate license file, not needed
+	rm license.txt || die
+	# Python requirements files, not needed
+	rm requirements_*.txt || die
+}
+
+src_compile() {
+	python_optimize "${S}"
+}
+
+src_test() {
+	# The tests use unittest, but are run with a custom runner script.
+	# QT_QPA_PLATFORM is required to make them run without X
+	local -x QT_QPA_PLATFORM=offscreen
+	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
+}
+
+src_install() {
+	local doc="${EPREFIX}/usr/share/doc/${PF}"
+	elog "Hydrus includes an excellent manual, that can either be viewed at"
+	elog "${doc}/html/help/index.html"
+	elog "or accessed through the hydrus help menu."
+
+	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
+
+	local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/)
+	local HTML_DOCS=("${S}"/help/)
+	einstalldocs
+
+	# Files only needed for testing
+	rm test.py hydrus/hydrus_test.py || die
+	rm -r hydrus/test/ static/testing/ || die
+
+	# These files are copied into doc
+	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
+	# The program expects to find documentation here, so add a symlink to doc
+	ln -s "${doc}/html/help" help || die
+
+	insinto /opt/hydrus
+	doins -r "${S}"/.
+
+	exeinto /usr/bin
+	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server")
+	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client")
+
+	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
+					   "AudioVideo;FileTools;Graphics;Network;"
+}
+
+pkg_postinst() {
+	optfeature "support for automatic port forwarding" "net-libs/miniupnpc"
+}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2021-07-01  8:54 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2021-07-01  8:54 UTC (permalink / raw
  To: gentoo-commits

commit:     af04e14d48d0ae36f0f4e2936723fa222f4d5295
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Thu Jul  1 08:18:27 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jul  1 08:53:46 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af04e14d

media-gfx/hydrus: Use [[ instead of [

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/hydrus-443.ebuild  | 2 +-
 media-gfx/hydrus/hydrus-444.ebuild  | 2 +-
 media-gfx/hydrus/hydrus-445.ebuild  | 2 +-
 media-gfx/hydrus/hydrus-9999.ebuild | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-gfx/hydrus/hydrus-443.ebuild b/media-gfx/hydrus/hydrus-443.ebuild
index d51d23e32a5..3ea6657aaea 100644
--- a/media-gfx/hydrus/hydrus-443.ebuild
+++ b/media-gfx/hydrus/hydrus-443.ebuild
@@ -11,7 +11,7 @@ inherit python-single-r1 desktop optfeature
 DESCRIPTION="A booru-like media organizer for the desktop"
 HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
 
-if [ "${PV}" == "9999" ]; then
+if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 
 	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"

diff --git a/media-gfx/hydrus/hydrus-444.ebuild b/media-gfx/hydrus/hydrus-444.ebuild
index d51d23e32a5..3ea6657aaea 100644
--- a/media-gfx/hydrus/hydrus-444.ebuild
+++ b/media-gfx/hydrus/hydrus-444.ebuild
@@ -11,7 +11,7 @@ inherit python-single-r1 desktop optfeature
 DESCRIPTION="A booru-like media organizer for the desktop"
 HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
 
-if [ "${PV}" == "9999" ]; then
+if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 
 	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"

diff --git a/media-gfx/hydrus/hydrus-445.ebuild b/media-gfx/hydrus/hydrus-445.ebuild
index 7fa30dda42b..2c52c2dc47e 100644
--- a/media-gfx/hydrus/hydrus-445.ebuild
+++ b/media-gfx/hydrus/hydrus-445.ebuild
@@ -11,7 +11,7 @@ inherit python-single-r1 desktop optfeature
 DESCRIPTION="A booru-like media organizer for the desktop"
 HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
 
-if [ "${PV}" == "9999" ]; then
+if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 
 	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"

diff --git a/media-gfx/hydrus/hydrus-9999.ebuild b/media-gfx/hydrus/hydrus-9999.ebuild
index d51d23e32a5..3ea6657aaea 100644
--- a/media-gfx/hydrus/hydrus-9999.ebuild
+++ b/media-gfx/hydrus/hydrus-9999.ebuild
@@ -11,7 +11,7 @@ inherit python-single-r1 desktop optfeature
 DESCRIPTION="A booru-like media organizer for the desktop"
 HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
 
-if [ "${PV}" == "9999" ]; then
+if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 
 	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2021-07-01  8:54 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2021-07-01  8:54 UTC (permalink / raw
  To: gentoo-commits

commit:     0d818d1fd7e5752b94aedd81acd53a5c03e08b16
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Thu Jul  1 08:18:56 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jul  1 08:53:47 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d818d1f

media-gfx/hydrus: Update 9999 to remove unneeded patches

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://github.com/gentoo/gentoo/pull/21495
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/hydrus-9999.ebuild | 2 --
 1 file changed, 2 deletions(-)

diff --git a/media-gfx/hydrus/hydrus-9999.ebuild b/media-gfx/hydrus/hydrus-9999.ebuild
index 3ea6657aaea..2c52c2dc47e 100644
--- a/media-gfx/hydrus/hydrus-9999.ebuild
+++ b/media-gfx/hydrus/hydrus-9999.ebuild
@@ -78,9 +78,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/upnpc.patch"
 	"${FILESDIR}/userpath-in-local-share.patch"
-	"${FILESDIR}/test-exitcode.patch"
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2021-07-01  8:54 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2021-07-01  8:54 UTC (permalink / raw
  To: gentoo-commits

commit:     3598eded30d4efe87217ac8ce491d2d58e55524b
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Thu Jul  1 08:03:32 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jul  1 08:53:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3598eded

media-gfx/hydrus: Drop 441-r1

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/Manifest             |   1 -
 media-gfx/hydrus/hydrus-441-r1.ebuild | 136 ----------------------------------
 2 files changed, 137 deletions(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index bfd185a2cbb..c71deb4fec8 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,4 +1,3 @@
-DIST hydrus-441.tar.gz 38807432 BLAKE2B e8294a8eb4d808792f2ff50ad4776f078ba1003962b065883ec22fd68f46dc250b2bccf47005731fcc964b75e07977aed45023da1c7e4513fcfcc29d1b4d1a97 SHA512 81eeb59006644b9b33c33c8da3e003640116488509ce2e1426d2a5c0161adf208e31a45c2a5efc2902769bf91e3db56aabc6384f77e8354e0e113bcc6df3a131
 DIST hydrus-442.tar.gz 38818985 BLAKE2B 955f5d9969bd46184fbf5fb11b1bc17257d184acd34a9533a20bc35e20ff5cabcc3715ebbb39f42b926b8b00f570c7f483eed3b11472c78f82b9ceeafc3dc765 SHA512 5a78338426127b276b067b52f590e275e132ea2676a4933162183e183a015556351e13e55271240059a145627d8a2ce1f6fe1a07ef267580604e998328c5c4f6
 DIST hydrus-443.tar.gz 38823767 BLAKE2B 100b2c0650d3230b1c18e58417b731bd661fecde50ac43010bcffe3f8f5be5e0416156523a2c3b5bcc4d739a54f3c6cf21559a2be2ba1dd6fe38131d91d00bee SHA512 d18f32c2cb05ab73dcff83d1a7bad63519b84640cce2991f00623da86197ecf72ac4f3c1e064515980a56d2c415dcb90e19edeb35646701bca0f3fc0d149be1d
 DIST hydrus-444.tar.gz 38817103 BLAKE2B f9eb3dc346a1a7b8d45558ee69b0b9d2a7dbbb7018734680e9953f20ebd56209cc1874213ecf5515835f1022bf571a99543154843f7dc2b9375116db8ba080a0 SHA512 f5bc28e43a5218fce15bc9d197ebcc1f4eb47856a741ad79f59d1da2413a3e7e220381a4d8208fe880fa507e023f9c03050e46ab5214ef310d105df0d85a9682

diff --git a/media-gfx/hydrus/hydrus-441-r1.ebuild b/media-gfx/hydrus/hydrus-441-r1.ebuild
deleted file mode 100644
index 5ce5c4bdf64..00000000000
--- a/media-gfx/hydrus/hydrus-441-r1.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="sqlite"
-
-inherit python-single-r1 desktop optfeature
-
-DESCRIPTION="A booru-like media organizer for the desktop"
-HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
-SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-# hydrus itself is WTFPL
-# icons included are CC-BY-2.5
-LICENSE="WTFPL-2 CC-BY-2.5"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+mpv +ffmpeg +lz4 socks +cloudscraper charts test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
-		dev-python/html5lib[${PYTHON_MULTI_USEDEP}]
-		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
-		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-		dev-python/psutil[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyside2[widgets,gui,charts?,${PYTHON_MULTI_USEDEP}]
-		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests[${PYTHON_MULTI_USEDEP}]
-		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
-		dev-python/service_identity[${PYTHON_MULTI_USEDEP}]
-		dev-python/six[${PYTHON_MULTI_USEDEP}]
-		dev-python/twisted[${PYTHON_MULTI_USEDEP}]
-		media-libs/opencv[python,png,jpeg,${PYTHON_MULTI_USEDEP}]
-
-		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_MULTI_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
-
-		cloudscraper? ( dev-python/cloudscraper[${PYTHON_MULTI_USEDEP}] )
-		ffmpeg? ( media-video/ffmpeg )
-		lz4? ( dev-python/lz4[${PYTHON_MULTI_USEDEP}] )
-		mpv? (
-			media-video/mpv[libmpv,${PYTHON_MULTI_USEDEP}]
-			dev-python/python-mpv[${PYTHON_MULTI_USEDEP}]
-		)
-		socks? (
-			|| ( dev-python/requests[socks5,${PYTHON_MULTI_USEDEP}]
-				dev-python/PySocks[${PYTHON_MULTI_USEDEP}] )
-		)
-	')
-"
-BDEPEND="
-	${RDEPEND}
-	$(python_gen_cond_dep '
-		test? (
-			dev-python/httmock[${PYTHON_MULTI_USEDEP}]
-			dev-python/mock[${PYTHON_MULTI_USEDEP}]
-			dev-python/nose[${PYTHON_MULTI_USEDEP}]
-			dev-python/unittest2[${PYTHON_MULTI_USEDEP}]
-		)
-	')
-"
-
-PATCHES=(
-	"${FILESDIR}/upnpc.patch"
-	"${FILESDIR}/userpath-in-local-share.patch"
-	"${FILESDIR}/test-exitcode.patch"
-)
-
-src_prepare() {
-	default
-
-	# Contains pre-built binaries for other systems and a broken swf renderer for linux
-	rm -r bin/ || die
-	# Build files used for CI, not actually needed
-	rm -r static/build_files || die
-	# Duplicate license file, not needed
-	rm license.txt || die
-	# Python requirements files, not needed
-	rm requirements_*.txt || die
-}
-
-src_compile() {
-	python_optimize "${S}"
-}
-
-src_test() {
-	# The tests use unittest, but are run with a custom runner script.
-	# QT_QPA_PLATFORM is required to make them run without X
-	local -x QT_QPA_PLATFORM=offscreen
-	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
-}
-
-src_install() {
-	local doc="${EPREFIX}/usr/share/doc/${PF}"
-	elog "Hydrus includes an excellent manual, that can either be viewed at"
-	elog "${doc}/html/help/index.html"
-	elog "or accessed through the hydrus help menu."
-
-	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
-
-	local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/)
-	local HTML_DOCS=("${S}"/help/)
-	einstalldocs
-
-	# Files only needed for testing
-	rm test.py hydrus/hydrus_test.py || die
-	rm -r hydrus/test/ static/testing/ || die
-
-	# These files are copied into doc
-	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
-	# The program expects to find documentation here, so add a symlink to doc
-	ln -s "${doc}/html/help" help || die
-
-	insinto /opt/hydrus
-	doins -r "${S}"/.
-
-	exeinto /usr/bin
-	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server")
-	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client")
-
-	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
-					   "AudioVideo;FileTools;Graphics;Network;"
-}
-
-pkg_postinst() {
-	optfeature "support for automatic port forwarding" "net-libs/miniupnpc"
-}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2021-07-01  8:54 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2021-07-01  8:54 UTC (permalink / raw
  To: gentoo-commits

commit:     78937973f596696eccf0cf709dd015f0b0f8966d
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Thu Jul  1 08:02:47 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jul  1 08:53:44 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78937973

media-gfx/hydrus: Add 445

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/Manifest          |   1 +
 media-gfx/hydrus/hydrus-445.ebuild | 142 +++++++++++++++++++++++++++++++++++++
 2 files changed, 143 insertions(+)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 310a331fafb..bfd185a2cbb 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -2,3 +2,4 @@ DIST hydrus-441.tar.gz 38807432 BLAKE2B e8294a8eb4d808792f2ff50ad4776f078ba10039
 DIST hydrus-442.tar.gz 38818985 BLAKE2B 955f5d9969bd46184fbf5fb11b1bc17257d184acd34a9533a20bc35e20ff5cabcc3715ebbb39f42b926b8b00f570c7f483eed3b11472c78f82b9ceeafc3dc765 SHA512 5a78338426127b276b067b52f590e275e132ea2676a4933162183e183a015556351e13e55271240059a145627d8a2ce1f6fe1a07ef267580604e998328c5c4f6
 DIST hydrus-443.tar.gz 38823767 BLAKE2B 100b2c0650d3230b1c18e58417b731bd661fecde50ac43010bcffe3f8f5be5e0416156523a2c3b5bcc4d739a54f3c6cf21559a2be2ba1dd6fe38131d91d00bee SHA512 d18f32c2cb05ab73dcff83d1a7bad63519b84640cce2991f00623da86197ecf72ac4f3c1e064515980a56d2c415dcb90e19edeb35646701bca0f3fc0d149be1d
 DIST hydrus-444.tar.gz 38817103 BLAKE2B f9eb3dc346a1a7b8d45558ee69b0b9d2a7dbbb7018734680e9953f20ebd56209cc1874213ecf5515835f1022bf571a99543154843f7dc2b9375116db8ba080a0 SHA512 f5bc28e43a5218fce15bc9d197ebcc1f4eb47856a741ad79f59d1da2413a3e7e220381a4d8208fe880fa507e023f9c03050e46ab5214ef310d105df0d85a9682
+DIST hydrus-445.tar.gz 38823389 BLAKE2B 3cd07a3e30e60bd8507fd58c027e5c5a96745163bd5982198448a65b957ff8f4308c9bc0ee73b883fa275689c900dff07f497634c07f4b2f7fe579e1e3d6f378 SHA512 6735468bd531786fef9a861a81ee1e34595c362450027a0c011593465ed77dc85a304a314dcb7031e30b2e90548b2497bb4f01932dc1f04e814b7dd5ae70617c

diff --git a/media-gfx/hydrus/hydrus-445.ebuild b/media-gfx/hydrus/hydrus-445.ebuild
new file mode 100644
index 00000000000..7fa30dda42b
--- /dev/null
+++ b/media-gfx/hydrus/hydrus-445.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="sqlite"
+
+inherit python-single-r1 desktop optfeature
+
+DESCRIPTION="A booru-like media organizer for the desktop"
+HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
+
+if [ "${PV}" == "9999" ]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
+else
+	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+# hydrus itself is WTFPL
+# icons included are CC-BY-2.5
+LICENSE="WTFPL-2 CC-BY-2.5"
+SLOT="0"
+IUSE="+mpv +ffmpeg +lz4 socks +cloudscraper charts test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+		dev-python/html5lib[${PYTHON_MULTI_USEDEP}]
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/psutil[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyside2[widgets,gui,charts?,${PYTHON_MULTI_USEDEP}]
+		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
+		dev-python/service_identity[${PYTHON_MULTI_USEDEP}]
+		dev-python/six[${PYTHON_MULTI_USEDEP}]
+		dev-python/twisted[${PYTHON_MULTI_USEDEP}]
+		media-libs/opencv[python,png,jpeg,${PYTHON_MULTI_USEDEP}]
+
+		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_MULTI_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+
+		cloudscraper? ( dev-python/cloudscraper[${PYTHON_MULTI_USEDEP}] )
+		ffmpeg? ( media-video/ffmpeg )
+		lz4? ( dev-python/lz4[${PYTHON_MULTI_USEDEP}] )
+		mpv? (
+			media-video/mpv[libmpv,${PYTHON_MULTI_USEDEP}]
+			dev-python/python-mpv[${PYTHON_MULTI_USEDEP}]
+		)
+		socks? (
+			|| ( dev-python/requests[socks5,${PYTHON_MULTI_USEDEP}]
+				dev-python/PySocks[${PYTHON_MULTI_USEDEP}] )
+		)
+	')
+"
+BDEPEND="
+	${RDEPEND}
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/httmock[${PYTHON_MULTI_USEDEP}]
+			dev-python/mock[${PYTHON_MULTI_USEDEP}]
+			dev-python/nose[${PYTHON_MULTI_USEDEP}]
+			dev-python/unittest2[${PYTHON_MULTI_USEDEP}]
+		)
+	')
+"
+
+PATCHES=(
+	"${FILESDIR}/userpath-in-local-share.patch"
+)
+
+src_prepare() {
+	default
+
+	# Contains pre-built binaries for other systems and a broken swf renderer for linux
+	rm -r bin/ || die
+	# Build files used for CI, not actually needed
+	rm -r static/build_files || die
+	# Duplicate license file, not needed
+	rm license.txt || die
+	# Python requirements files, not needed
+	rm requirements_*.txt || die
+}
+
+src_compile() {
+	python_optimize "${S}"
+}
+
+src_test() {
+	# The tests use unittest, but are run with a custom runner script.
+	# QT_QPA_PLATFORM is required to make them run without X
+	local -x QT_QPA_PLATFORM=offscreen
+	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
+}
+
+src_install() {
+	local doc="${EPREFIX}/usr/share/doc/${PF}"
+	elog "Hydrus includes an excellent manual, that can either be viewed at"
+	elog "${doc}/html/help/index.html"
+	elog "or accessed through the hydrus help menu."
+
+	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
+
+	local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/)
+	local HTML_DOCS=("${S}"/help/)
+	einstalldocs
+
+	# Files only needed for testing
+	rm test.py hydrus/hydrus_test.py || die
+	rm -r hydrus/test/ static/testing/ || die
+
+	# These files are copied into doc
+	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
+	# The program expects to find documentation here, so add a symlink to doc
+	ln -s "${doc}/html/help" help || die
+
+	insinto /opt/hydrus
+	doins -r "${S}"/.
+
+	exeinto /usr/bin
+	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server")
+	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client")
+
+	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
+					   "AudioVideo;FileTools;Graphics;Network;"
+}
+
+pkg_postinst() {
+	optfeature "support for automatic port forwarding" "net-libs/miniupnpc"
+}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2021-07-05 13:29 Michał Górny
  0 siblings, 0 replies; 104+ messages in thread
From: Michał Górny @ 2021-07-05 13:29 UTC (permalink / raw
  To: gentoo-commits

commit:     6039aa988f224d29783094f0588787306adf0b02
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  5 13:28:41 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jul  5 13:28:41 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6039aa98

media-gfx/hydrus: Remove stale dep on unittest2

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 media-gfx/hydrus/hydrus-442.ebuild  | 1 -
 media-gfx/hydrus/hydrus-443.ebuild  | 1 -
 media-gfx/hydrus/hydrus-444.ebuild  | 1 -
 media-gfx/hydrus/hydrus-445.ebuild  | 1 -
 media-gfx/hydrus/hydrus-9999.ebuild | 1 -
 5 files changed, 5 deletions(-)

diff --git a/media-gfx/hydrus/hydrus-442.ebuild b/media-gfx/hydrus/hydrus-442.ebuild
index 5ce5c4bdf64..3133d5282a5 100644
--- a/media-gfx/hydrus/hydrus-442.ebuild
+++ b/media-gfx/hydrus/hydrus-442.ebuild
@@ -64,7 +64,6 @@ BDEPEND="
 			dev-python/httmock[${PYTHON_MULTI_USEDEP}]
 			dev-python/mock[${PYTHON_MULTI_USEDEP}]
 			dev-python/nose[${PYTHON_MULTI_USEDEP}]
-			dev-python/unittest2[${PYTHON_MULTI_USEDEP}]
 		)
 	')
 "

diff --git a/media-gfx/hydrus/hydrus-443.ebuild b/media-gfx/hydrus/hydrus-443.ebuild
index 3ea6657aaea..fb12102cde9 100644
--- a/media-gfx/hydrus/hydrus-443.ebuild
+++ b/media-gfx/hydrus/hydrus-443.ebuild
@@ -72,7 +72,6 @@ BDEPEND="
 			dev-python/httmock[${PYTHON_MULTI_USEDEP}]
 			dev-python/mock[${PYTHON_MULTI_USEDEP}]
 			dev-python/nose[${PYTHON_MULTI_USEDEP}]
-			dev-python/unittest2[${PYTHON_MULTI_USEDEP}]
 		)
 	')
 "

diff --git a/media-gfx/hydrus/hydrus-444.ebuild b/media-gfx/hydrus/hydrus-444.ebuild
index 3ea6657aaea..fb12102cde9 100644
--- a/media-gfx/hydrus/hydrus-444.ebuild
+++ b/media-gfx/hydrus/hydrus-444.ebuild
@@ -72,7 +72,6 @@ BDEPEND="
 			dev-python/httmock[${PYTHON_MULTI_USEDEP}]
 			dev-python/mock[${PYTHON_MULTI_USEDEP}]
 			dev-python/nose[${PYTHON_MULTI_USEDEP}]
-			dev-python/unittest2[${PYTHON_MULTI_USEDEP}]
 		)
 	')
 "

diff --git a/media-gfx/hydrus/hydrus-445.ebuild b/media-gfx/hydrus/hydrus-445.ebuild
index 2c52c2dc47e..abe83ba3872 100644
--- a/media-gfx/hydrus/hydrus-445.ebuild
+++ b/media-gfx/hydrus/hydrus-445.ebuild
@@ -72,7 +72,6 @@ BDEPEND="
 			dev-python/httmock[${PYTHON_MULTI_USEDEP}]
 			dev-python/mock[${PYTHON_MULTI_USEDEP}]
 			dev-python/nose[${PYTHON_MULTI_USEDEP}]
-			dev-python/unittest2[${PYTHON_MULTI_USEDEP}]
 		)
 	')
 "

diff --git a/media-gfx/hydrus/hydrus-9999.ebuild b/media-gfx/hydrus/hydrus-9999.ebuild
index 2c52c2dc47e..abe83ba3872 100644
--- a/media-gfx/hydrus/hydrus-9999.ebuild
+++ b/media-gfx/hydrus/hydrus-9999.ebuild
@@ -72,7 +72,6 @@ BDEPEND="
 			dev-python/httmock[${PYTHON_MULTI_USEDEP}]
 			dev-python/mock[${PYTHON_MULTI_USEDEP}]
 			dev-python/nose[${PYTHON_MULTI_USEDEP}]
-			dev-python/unittest2[${PYTHON_MULTI_USEDEP}]
 		)
 	')
 "


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2021-07-13  4:22 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2021-07-13  4:22 UTC (permalink / raw
  To: gentoo-commits

commit:     29ec9d25ee637c7ddd054e8d13ffd370c0557b92
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Thu Jul  8 07:55:35 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jul 13 04:21:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29ec9d25

media-gfx/hydrus: Drop 442

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/Manifest          |   1 -
 media-gfx/hydrus/hydrus-442.ebuild | 135 -------------------------------------
 2 files changed, 136 deletions(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index c71deb4fec8..37245c50da8 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,4 +1,3 @@
-DIST hydrus-442.tar.gz 38818985 BLAKE2B 955f5d9969bd46184fbf5fb11b1bc17257d184acd34a9533a20bc35e20ff5cabcc3715ebbb39f42b926b8b00f570c7f483eed3b11472c78f82b9ceeafc3dc765 SHA512 5a78338426127b276b067b52f590e275e132ea2676a4933162183e183a015556351e13e55271240059a145627d8a2ce1f6fe1a07ef267580604e998328c5c4f6
 DIST hydrus-443.tar.gz 38823767 BLAKE2B 100b2c0650d3230b1c18e58417b731bd661fecde50ac43010bcffe3f8f5be5e0416156523a2c3b5bcc4d739a54f3c6cf21559a2be2ba1dd6fe38131d91d00bee SHA512 d18f32c2cb05ab73dcff83d1a7bad63519b84640cce2991f00623da86197ecf72ac4f3c1e064515980a56d2c415dcb90e19edeb35646701bca0f3fc0d149be1d
 DIST hydrus-444.tar.gz 38817103 BLAKE2B f9eb3dc346a1a7b8d45558ee69b0b9d2a7dbbb7018734680e9953f20ebd56209cc1874213ecf5515835f1022bf571a99543154843f7dc2b9375116db8ba080a0 SHA512 f5bc28e43a5218fce15bc9d197ebcc1f4eb47856a741ad79f59d1da2413a3e7e220381a4d8208fe880fa507e023f9c03050e46ab5214ef310d105df0d85a9682
 DIST hydrus-445.tar.gz 38823389 BLAKE2B 3cd07a3e30e60bd8507fd58c027e5c5a96745163bd5982198448a65b957ff8f4308c9bc0ee73b883fa275689c900dff07f497634c07f4b2f7fe579e1e3d6f378 SHA512 6735468bd531786fef9a861a81ee1e34595c362450027a0c011593465ed77dc85a304a314dcb7031e30b2e90548b2497bb4f01932dc1f04e814b7dd5ae70617c

diff --git a/media-gfx/hydrus/hydrus-442.ebuild b/media-gfx/hydrus/hydrus-442.ebuild
deleted file mode 100644
index 3133d5282a5..00000000000
--- a/media-gfx/hydrus/hydrus-442.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="sqlite"
-
-inherit python-single-r1 desktop optfeature
-
-DESCRIPTION="A booru-like media organizer for the desktop"
-HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
-SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-# hydrus itself is WTFPL
-# icons included are CC-BY-2.5
-LICENSE="WTFPL-2 CC-BY-2.5"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+mpv +ffmpeg +lz4 socks +cloudscraper charts test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
-		dev-python/html5lib[${PYTHON_MULTI_USEDEP}]
-		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
-		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-		dev-python/psutil[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyside2[widgets,gui,charts?,${PYTHON_MULTI_USEDEP}]
-		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests[${PYTHON_MULTI_USEDEP}]
-		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
-		dev-python/service_identity[${PYTHON_MULTI_USEDEP}]
-		dev-python/six[${PYTHON_MULTI_USEDEP}]
-		dev-python/twisted[${PYTHON_MULTI_USEDEP}]
-		media-libs/opencv[python,png,jpeg,${PYTHON_MULTI_USEDEP}]
-
-		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_MULTI_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
-
-		cloudscraper? ( dev-python/cloudscraper[${PYTHON_MULTI_USEDEP}] )
-		ffmpeg? ( media-video/ffmpeg )
-		lz4? ( dev-python/lz4[${PYTHON_MULTI_USEDEP}] )
-		mpv? (
-			media-video/mpv[libmpv,${PYTHON_MULTI_USEDEP}]
-			dev-python/python-mpv[${PYTHON_MULTI_USEDEP}]
-		)
-		socks? (
-			|| ( dev-python/requests[socks5,${PYTHON_MULTI_USEDEP}]
-				dev-python/PySocks[${PYTHON_MULTI_USEDEP}] )
-		)
-	')
-"
-BDEPEND="
-	${RDEPEND}
-	$(python_gen_cond_dep '
-		test? (
-			dev-python/httmock[${PYTHON_MULTI_USEDEP}]
-			dev-python/mock[${PYTHON_MULTI_USEDEP}]
-			dev-python/nose[${PYTHON_MULTI_USEDEP}]
-		)
-	')
-"
-
-PATCHES=(
-	"${FILESDIR}/upnpc.patch"
-	"${FILESDIR}/userpath-in-local-share.patch"
-	"${FILESDIR}/test-exitcode.patch"
-)
-
-src_prepare() {
-	default
-
-	# Contains pre-built binaries for other systems and a broken swf renderer for linux
-	rm -r bin/ || die
-	# Build files used for CI, not actually needed
-	rm -r static/build_files || die
-	# Duplicate license file, not needed
-	rm license.txt || die
-	# Python requirements files, not needed
-	rm requirements_*.txt || die
-}
-
-src_compile() {
-	python_optimize "${S}"
-}
-
-src_test() {
-	# The tests use unittest, but are run with a custom runner script.
-	# QT_QPA_PLATFORM is required to make them run without X
-	local -x QT_QPA_PLATFORM=offscreen
-	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
-}
-
-src_install() {
-	local doc="${EPREFIX}/usr/share/doc/${PF}"
-	elog "Hydrus includes an excellent manual, that can either be viewed at"
-	elog "${doc}/html/help/index.html"
-	elog "or accessed through the hydrus help menu."
-
-	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
-
-	local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/)
-	local HTML_DOCS=("${S}"/help/)
-	einstalldocs
-
-	# Files only needed for testing
-	rm test.py hydrus/hydrus_test.py || die
-	rm -r hydrus/test/ static/testing/ || die
-
-	# These files are copied into doc
-	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
-	# The program expects to find documentation here, so add a symlink to doc
-	ln -s "${doc}/html/help" help || die
-
-	insinto /opt/hydrus
-	doins -r "${S}"/.
-
-	exeinto /usr/bin
-	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server")
-	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client")
-
-	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
-					   "AudioVideo;FileTools;Graphics;Network;"
-}
-
-pkg_postinst() {
-	optfeature "support for automatic port forwarding" "net-libs/miniupnpc"
-}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2021-07-13  4:22 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2021-07-13  4:22 UTC (permalink / raw
  To: gentoo-commits

commit:     d7312598e238167fe6b1a262b26b64f90d9d1d95
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Thu Jul  8 07:55:55 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jul 13 04:21:46 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7312598

media-gfx/hydrus: Add 446

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://github.com/gentoo/gentoo/pull/21563
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/Manifest          |   1 +
 media-gfx/hydrus/hydrus-446.ebuild | 141 +++++++++++++++++++++++++++++++++++++
 2 files changed, 142 insertions(+)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 37245c50da8..771a7ab241b 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,3 +1,4 @@
 DIST hydrus-443.tar.gz 38823767 BLAKE2B 100b2c0650d3230b1c18e58417b731bd661fecde50ac43010bcffe3f8f5be5e0416156523a2c3b5bcc4d739a54f3c6cf21559a2be2ba1dd6fe38131d91d00bee SHA512 d18f32c2cb05ab73dcff83d1a7bad63519b84640cce2991f00623da86197ecf72ac4f3c1e064515980a56d2c415dcb90e19edeb35646701bca0f3fc0d149be1d
 DIST hydrus-444.tar.gz 38817103 BLAKE2B f9eb3dc346a1a7b8d45558ee69b0b9d2a7dbbb7018734680e9953f20ebd56209cc1874213ecf5515835f1022bf571a99543154843f7dc2b9375116db8ba080a0 SHA512 f5bc28e43a5218fce15bc9d197ebcc1f4eb47856a741ad79f59d1da2413a3e7e220381a4d8208fe880fa507e023f9c03050e46ab5214ef310d105df0d85a9682
 DIST hydrus-445.tar.gz 38823389 BLAKE2B 3cd07a3e30e60bd8507fd58c027e5c5a96745163bd5982198448a65b957ff8f4308c9bc0ee73b883fa275689c900dff07f497634c07f4b2f7fe579e1e3d6f378 SHA512 6735468bd531786fef9a861a81ee1e34595c362450027a0c011593465ed77dc85a304a314dcb7031e30b2e90548b2497bb4f01932dc1f04e814b7dd5ae70617c
+DIST hydrus-446.tar.gz 38830223 BLAKE2B 5ab44f9cfbd15eb10144135eb4cc1d8493c20f2a931db4332a61aa186fddff96cb3a3b29eb2b210f070bb4be8210d552beb2578a7287a169a7364f02363e05f4 SHA512 bdbcd1177c3bf6ee85089e1a653587bae41c524bc2313bb5d481dee074c7da1c533a91957dc3b03d1c0b515e705809887e290ac71b866a51664f2a9a34bbfb6b

diff --git a/media-gfx/hydrus/hydrus-446.ebuild b/media-gfx/hydrus/hydrus-446.ebuild
new file mode 100644
index 00000000000..abe83ba3872
--- /dev/null
+++ b/media-gfx/hydrus/hydrus-446.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="sqlite"
+
+inherit python-single-r1 desktop optfeature
+
+DESCRIPTION="A booru-like media organizer for the desktop"
+HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
+else
+	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+# hydrus itself is WTFPL
+# icons included are CC-BY-2.5
+LICENSE="WTFPL-2 CC-BY-2.5"
+SLOT="0"
+IUSE="+mpv +ffmpeg +lz4 socks +cloudscraper charts test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+		dev-python/html5lib[${PYTHON_MULTI_USEDEP}]
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/psutil[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyside2[widgets,gui,charts?,${PYTHON_MULTI_USEDEP}]
+		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
+		dev-python/service_identity[${PYTHON_MULTI_USEDEP}]
+		dev-python/six[${PYTHON_MULTI_USEDEP}]
+		dev-python/twisted[${PYTHON_MULTI_USEDEP}]
+		media-libs/opencv[python,png,jpeg,${PYTHON_MULTI_USEDEP}]
+
+		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_MULTI_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+
+		cloudscraper? ( dev-python/cloudscraper[${PYTHON_MULTI_USEDEP}] )
+		ffmpeg? ( media-video/ffmpeg )
+		lz4? ( dev-python/lz4[${PYTHON_MULTI_USEDEP}] )
+		mpv? (
+			media-video/mpv[libmpv,${PYTHON_MULTI_USEDEP}]
+			dev-python/python-mpv[${PYTHON_MULTI_USEDEP}]
+		)
+		socks? (
+			|| ( dev-python/requests[socks5,${PYTHON_MULTI_USEDEP}]
+				dev-python/PySocks[${PYTHON_MULTI_USEDEP}] )
+		)
+	')
+"
+BDEPEND="
+	${RDEPEND}
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/httmock[${PYTHON_MULTI_USEDEP}]
+			dev-python/mock[${PYTHON_MULTI_USEDEP}]
+			dev-python/nose[${PYTHON_MULTI_USEDEP}]
+		)
+	')
+"
+
+PATCHES=(
+	"${FILESDIR}/userpath-in-local-share.patch"
+)
+
+src_prepare() {
+	default
+
+	# Contains pre-built binaries for other systems and a broken swf renderer for linux
+	rm -r bin/ || die
+	# Build files used for CI, not actually needed
+	rm -r static/build_files || die
+	# Duplicate license file, not needed
+	rm license.txt || die
+	# Python requirements files, not needed
+	rm requirements_*.txt || die
+}
+
+src_compile() {
+	python_optimize "${S}"
+}
+
+src_test() {
+	# The tests use unittest, but are run with a custom runner script.
+	# QT_QPA_PLATFORM is required to make them run without X
+	local -x QT_QPA_PLATFORM=offscreen
+	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
+}
+
+src_install() {
+	local doc="${EPREFIX}/usr/share/doc/${PF}"
+	elog "Hydrus includes an excellent manual, that can either be viewed at"
+	elog "${doc}/html/help/index.html"
+	elog "or accessed through the hydrus help menu."
+
+	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
+
+	local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/)
+	local HTML_DOCS=("${S}"/help/)
+	einstalldocs
+
+	# Files only needed for testing
+	rm test.py hydrus/hydrus_test.py || die
+	rm -r hydrus/test/ static/testing/ || die
+
+	# These files are copied into doc
+	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
+	# The program expects to find documentation here, so add a symlink to doc
+	ln -s "${doc}/html/help" help || die
+
+	insinto /opt/hydrus
+	doins -r "${S}"/.
+
+	exeinto /usr/bin
+	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server")
+	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client")
+
+	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
+					   "AudioVideo;FileTools;Graphics;Network;"
+}
+
+pkg_postinst() {
+	optfeature "support for automatic port forwarding" "net-libs/miniupnpc"
+}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2021-07-16  1:34 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2021-07-16  1:34 UTC (permalink / raw
  To: gentoo-commits

commit:     e1898b191fde9e695fc922cc962eb21482233cba
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Thu Jul 15 14:18:22 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 16 01:33:20 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1898b19

media-gfx/hydrus: Drop 443

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://github.com/gentoo/gentoo/pull/21653
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/Manifest          |   1 -
 media-gfx/hydrus/hydrus-443.ebuild | 143 -------------------------------------
 2 files changed, 144 deletions(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index bd108a8a44d..27c31937284 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,4 +1,3 @@
-DIST hydrus-443.tar.gz 38823767 BLAKE2B 100b2c0650d3230b1c18e58417b731bd661fecde50ac43010bcffe3f8f5be5e0416156523a2c3b5bcc4d739a54f3c6cf21559a2be2ba1dd6fe38131d91d00bee SHA512 d18f32c2cb05ab73dcff83d1a7bad63519b84640cce2991f00623da86197ecf72ac4f3c1e064515980a56d2c415dcb90e19edeb35646701bca0f3fc0d149be1d
 DIST hydrus-444.tar.gz 38817103 BLAKE2B f9eb3dc346a1a7b8d45558ee69b0b9d2a7dbbb7018734680e9953f20ebd56209cc1874213ecf5515835f1022bf571a99543154843f7dc2b9375116db8ba080a0 SHA512 f5bc28e43a5218fce15bc9d197ebcc1f4eb47856a741ad79f59d1da2413a3e7e220381a4d8208fe880fa507e023f9c03050e46ab5214ef310d105df0d85a9682
 DIST hydrus-445.tar.gz 38823389 BLAKE2B 3cd07a3e30e60bd8507fd58c027e5c5a96745163bd5982198448a65b957ff8f4308c9bc0ee73b883fa275689c900dff07f497634c07f4b2f7fe579e1e3d6f378 SHA512 6735468bd531786fef9a861a81ee1e34595c362450027a0c011593465ed77dc85a304a314dcb7031e30b2e90548b2497bb4f01932dc1f04e814b7dd5ae70617c
 DIST hydrus-446.tar.gz 38830223 BLAKE2B 5ab44f9cfbd15eb10144135eb4cc1d8493c20f2a931db4332a61aa186fddff96cb3a3b29eb2b210f070bb4be8210d552beb2578a7287a169a7364f02363e05f4 SHA512 bdbcd1177c3bf6ee85089e1a653587bae41c524bc2313bb5d481dee074c7da1c533a91957dc3b03d1c0b515e705809887e290ac71b866a51664f2a9a34bbfb6b

diff --git a/media-gfx/hydrus/hydrus-443.ebuild b/media-gfx/hydrus/hydrus-443.ebuild
deleted file mode 100644
index fb12102cde9..00000000000
--- a/media-gfx/hydrus/hydrus-443.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="sqlite"
-
-inherit python-single-r1 desktop optfeature
-
-DESCRIPTION="A booru-like media organizer for the desktop"
-HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
-else
-	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-	KEYWORDS="~amd64"
-fi
-
-# hydrus itself is WTFPL
-# icons included are CC-BY-2.5
-LICENSE="WTFPL-2 CC-BY-2.5"
-SLOT="0"
-IUSE="+mpv +ffmpeg +lz4 socks +cloudscraper charts test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
-		dev-python/html5lib[${PYTHON_MULTI_USEDEP}]
-		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
-		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-		dev-python/psutil[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyside2[widgets,gui,charts?,${PYTHON_MULTI_USEDEP}]
-		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests[${PYTHON_MULTI_USEDEP}]
-		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
-		dev-python/service_identity[${PYTHON_MULTI_USEDEP}]
-		dev-python/six[${PYTHON_MULTI_USEDEP}]
-		dev-python/twisted[${PYTHON_MULTI_USEDEP}]
-		media-libs/opencv[python,png,jpeg,${PYTHON_MULTI_USEDEP}]
-
-		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_MULTI_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
-
-		cloudscraper? ( dev-python/cloudscraper[${PYTHON_MULTI_USEDEP}] )
-		ffmpeg? ( media-video/ffmpeg )
-		lz4? ( dev-python/lz4[${PYTHON_MULTI_USEDEP}] )
-		mpv? (
-			media-video/mpv[libmpv,${PYTHON_MULTI_USEDEP}]
-			dev-python/python-mpv[${PYTHON_MULTI_USEDEP}]
-		)
-		socks? (
-			|| ( dev-python/requests[socks5,${PYTHON_MULTI_USEDEP}]
-				dev-python/PySocks[${PYTHON_MULTI_USEDEP}] )
-		)
-	')
-"
-BDEPEND="
-	${RDEPEND}
-	$(python_gen_cond_dep '
-		test? (
-			dev-python/httmock[${PYTHON_MULTI_USEDEP}]
-			dev-python/mock[${PYTHON_MULTI_USEDEP}]
-			dev-python/nose[${PYTHON_MULTI_USEDEP}]
-		)
-	')
-"
-
-PATCHES=(
-	"${FILESDIR}/upnpc.patch"
-	"${FILESDIR}/userpath-in-local-share.patch"
-	"${FILESDIR}/test-exitcode.patch"
-)
-
-src_prepare() {
-	default
-
-	# Contains pre-built binaries for other systems and a broken swf renderer for linux
-	rm -r bin/ || die
-	# Build files used for CI, not actually needed
-	rm -r static/build_files || die
-	# Duplicate license file, not needed
-	rm license.txt || die
-	# Python requirements files, not needed
-	rm requirements_*.txt || die
-}
-
-src_compile() {
-	python_optimize "${S}"
-}
-
-src_test() {
-	# The tests use unittest, but are run with a custom runner script.
-	# QT_QPA_PLATFORM is required to make them run without X
-	local -x QT_QPA_PLATFORM=offscreen
-	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
-}
-
-src_install() {
-	local doc="${EPREFIX}/usr/share/doc/${PF}"
-	elog "Hydrus includes an excellent manual, that can either be viewed at"
-	elog "${doc}/html/help/index.html"
-	elog "or accessed through the hydrus help menu."
-
-	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
-
-	local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/)
-	local HTML_DOCS=("${S}"/help/)
-	einstalldocs
-
-	# Files only needed for testing
-	rm test.py hydrus/hydrus_test.py || die
-	rm -r hydrus/test/ static/testing/ || die
-
-	# These files are copied into doc
-	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
-	# The program expects to find documentation here, so add a symlink to doc
-	ln -s "${doc}/html/help" help || die
-
-	insinto /opt/hydrus
-	doins -r "${S}"/.
-
-	exeinto /usr/bin
-	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server")
-	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client")
-
-	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
-					   "AudioVideo;FileTools;Graphics;Network;"
-}
-
-pkg_postinst() {
-	optfeature "support for automatic port forwarding" "net-libs/miniupnpc"
-}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2021-07-16  1:34 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2021-07-16  1:34 UTC (permalink / raw
  To: gentoo-commits

commit:     fa409ed342713271b505116594c59ca32e7e12d0
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Thu Jul 15 14:17:37 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 16 01:33:19 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa409ed3

media-gfx/hydrus: Add 447

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/Manifest          |   1 +
 media-gfx/hydrus/hydrus-447.ebuild | 141 +++++++++++++++++++++++++++++++++++++
 2 files changed, 142 insertions(+)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 771a7ab241b..bd108a8a44d 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -2,3 +2,4 @@ DIST hydrus-443.tar.gz 38823767 BLAKE2B 100b2c0650d3230b1c18e58417b731bd661fecde
 DIST hydrus-444.tar.gz 38817103 BLAKE2B f9eb3dc346a1a7b8d45558ee69b0b9d2a7dbbb7018734680e9953f20ebd56209cc1874213ecf5515835f1022bf571a99543154843f7dc2b9375116db8ba080a0 SHA512 f5bc28e43a5218fce15bc9d197ebcc1f4eb47856a741ad79f59d1da2413a3e7e220381a4d8208fe880fa507e023f9c03050e46ab5214ef310d105df0d85a9682
 DIST hydrus-445.tar.gz 38823389 BLAKE2B 3cd07a3e30e60bd8507fd58c027e5c5a96745163bd5982198448a65b957ff8f4308c9bc0ee73b883fa275689c900dff07f497634c07f4b2f7fe579e1e3d6f378 SHA512 6735468bd531786fef9a861a81ee1e34595c362450027a0c011593465ed77dc85a304a314dcb7031e30b2e90548b2497bb4f01932dc1f04e814b7dd5ae70617c
 DIST hydrus-446.tar.gz 38830223 BLAKE2B 5ab44f9cfbd15eb10144135eb4cc1d8493c20f2a931db4332a61aa186fddff96cb3a3b29eb2b210f070bb4be8210d552beb2578a7287a169a7364f02363e05f4 SHA512 bdbcd1177c3bf6ee85089e1a653587bae41c524bc2313bb5d481dee074c7da1c533a91957dc3b03d1c0b515e705809887e290ac71b866a51664f2a9a34bbfb6b
+DIST hydrus-447.tar.gz 38833157 BLAKE2B 8d7cf37a1419ef40fa7816958a01421ecc335d2a8c975fcf16d3ea5dfbdb76d872e4e597bdbade28eff7727914de5de7fb6ffcc7ecc27a712410031efa8433fe SHA512 85eaab40f192f2414be828545464811af2590b55e1a2fea7bbf64f27e4bb9a8b6c6c86cb25c1f7e9f48449173f079dcd749ea25ed22559bebb11adddce62da94

diff --git a/media-gfx/hydrus/hydrus-447.ebuild b/media-gfx/hydrus/hydrus-447.ebuild
new file mode 100644
index 00000000000..abe83ba3872
--- /dev/null
+++ b/media-gfx/hydrus/hydrus-447.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="sqlite"
+
+inherit python-single-r1 desktop optfeature
+
+DESCRIPTION="A booru-like media organizer for the desktop"
+HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
+else
+	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+# hydrus itself is WTFPL
+# icons included are CC-BY-2.5
+LICENSE="WTFPL-2 CC-BY-2.5"
+SLOT="0"
+IUSE="+mpv +ffmpeg +lz4 socks +cloudscraper charts test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+		dev-python/html5lib[${PYTHON_MULTI_USEDEP}]
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/psutil[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyside2[widgets,gui,charts?,${PYTHON_MULTI_USEDEP}]
+		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
+		dev-python/service_identity[${PYTHON_MULTI_USEDEP}]
+		dev-python/six[${PYTHON_MULTI_USEDEP}]
+		dev-python/twisted[${PYTHON_MULTI_USEDEP}]
+		media-libs/opencv[python,png,jpeg,${PYTHON_MULTI_USEDEP}]
+
+		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_MULTI_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+
+		cloudscraper? ( dev-python/cloudscraper[${PYTHON_MULTI_USEDEP}] )
+		ffmpeg? ( media-video/ffmpeg )
+		lz4? ( dev-python/lz4[${PYTHON_MULTI_USEDEP}] )
+		mpv? (
+			media-video/mpv[libmpv,${PYTHON_MULTI_USEDEP}]
+			dev-python/python-mpv[${PYTHON_MULTI_USEDEP}]
+		)
+		socks? (
+			|| ( dev-python/requests[socks5,${PYTHON_MULTI_USEDEP}]
+				dev-python/PySocks[${PYTHON_MULTI_USEDEP}] )
+		)
+	')
+"
+BDEPEND="
+	${RDEPEND}
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/httmock[${PYTHON_MULTI_USEDEP}]
+			dev-python/mock[${PYTHON_MULTI_USEDEP}]
+			dev-python/nose[${PYTHON_MULTI_USEDEP}]
+		)
+	')
+"
+
+PATCHES=(
+	"${FILESDIR}/userpath-in-local-share.patch"
+)
+
+src_prepare() {
+	default
+
+	# Contains pre-built binaries for other systems and a broken swf renderer for linux
+	rm -r bin/ || die
+	# Build files used for CI, not actually needed
+	rm -r static/build_files || die
+	# Duplicate license file, not needed
+	rm license.txt || die
+	# Python requirements files, not needed
+	rm requirements_*.txt || die
+}
+
+src_compile() {
+	python_optimize "${S}"
+}
+
+src_test() {
+	# The tests use unittest, but are run with a custom runner script.
+	# QT_QPA_PLATFORM is required to make them run without X
+	local -x QT_QPA_PLATFORM=offscreen
+	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
+}
+
+src_install() {
+	local doc="${EPREFIX}/usr/share/doc/${PF}"
+	elog "Hydrus includes an excellent manual, that can either be viewed at"
+	elog "${doc}/html/help/index.html"
+	elog "or accessed through the hydrus help menu."
+
+	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
+
+	local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/)
+	local HTML_DOCS=("${S}"/help/)
+	einstalldocs
+
+	# Files only needed for testing
+	rm test.py hydrus/hydrus_test.py || die
+	rm -r hydrus/test/ static/testing/ || die
+
+	# These files are copied into doc
+	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
+	# The program expects to find documentation here, so add a symlink to doc
+	ln -s "${doc}/html/help" help || die
+
+	insinto /opt/hydrus
+	doins -r "${S}"/.
+
+	exeinto /usr/bin
+	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server")
+	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client")
+
+	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
+					   "AudioVideo;FileTools;Graphics;Network;"
+}
+
+pkg_postinst() {
+	optfeature "support for automatic port forwarding" "net-libs/miniupnpc"
+}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2021-08-02  3:34 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2021-08-02  3:34 UTC (permalink / raw
  To: gentoo-commits

commit:     909acd4b003c598d81846be1af429eede826dced
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Sun Aug  1 17:16:31 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug  2 03:34:35 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=909acd4b

media-gfx/hydrus: Add suggested ebuild improvements to all versions

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://github.com/gentoo/gentoo/pull/21826
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/hydrus-445.ebuild  | 12 ++++++++----
 media-gfx/hydrus/hydrus-446.ebuild  | 12 ++++++++----
 media-gfx/hydrus/hydrus-447.ebuild  | 12 ++++++++----
 media-gfx/hydrus/hydrus-448.ebuild  | 12 ++++++++----
 media-gfx/hydrus/hydrus-9999.ebuild | 12 ++++++++----
 5 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/media-gfx/hydrus/hydrus-445.ebuild b/media-gfx/hydrus/hydrus-445.ebuild
index c735f0ac9e1..ff24bd7b24a 100644
--- a/media-gfx/hydrus/hydrus-445.ebuild
+++ b/media-gfx/hydrus/hydrus-445.ebuild
@@ -25,11 +25,15 @@ fi
 # icons included are CC-BY-2.5
 LICENSE="WTFPL-2 CC-BY-2.5"
 SLOT="0"
-IUSE="+mpv +ffmpeg +lz4 socks +cloudscraper charts test"
+IUSE="+cloudscraper +ffmpeg +lz4 charts socks test +mpv"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RESTRICT="!test? ( test )"
 
+# RDEPEND is sorted as such:
+# - No specific requirements
+# - Specific version or slot
+# - Depends on use flags
 RDEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
@@ -123,14 +127,14 @@ src_install() {
 	# These files are copied into doc
 	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
 	# The program expects to find documentation here, so add a symlink to doc
-	ln -s "${doc}/html/help" help || die
+	dosym "${doc}/html/help" help
 
 	insinto /opt/hydrus
 	doins -r "${S}"/.
 
 	exeinto /usr/bin
-	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server")
-	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client")
+	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
+	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
 
 	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
 					   "AudioVideo;FileTools;Graphics;Network;"

diff --git a/media-gfx/hydrus/hydrus-446.ebuild b/media-gfx/hydrus/hydrus-446.ebuild
index c735f0ac9e1..ff24bd7b24a 100644
--- a/media-gfx/hydrus/hydrus-446.ebuild
+++ b/media-gfx/hydrus/hydrus-446.ebuild
@@ -25,11 +25,15 @@ fi
 # icons included are CC-BY-2.5
 LICENSE="WTFPL-2 CC-BY-2.5"
 SLOT="0"
-IUSE="+mpv +ffmpeg +lz4 socks +cloudscraper charts test"
+IUSE="+cloudscraper +ffmpeg +lz4 charts socks test +mpv"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RESTRICT="!test? ( test )"
 
+# RDEPEND is sorted as such:
+# - No specific requirements
+# - Specific version or slot
+# - Depends on use flags
 RDEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
@@ -123,14 +127,14 @@ src_install() {
 	# These files are copied into doc
 	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
 	# The program expects to find documentation here, so add a symlink to doc
-	ln -s "${doc}/html/help" help || die
+	dosym "${doc}/html/help" help
 
 	insinto /opt/hydrus
 	doins -r "${S}"/.
 
 	exeinto /usr/bin
-	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server")
-	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client")
+	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
+	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
 
 	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
 					   "AudioVideo;FileTools;Graphics;Network;"

diff --git a/media-gfx/hydrus/hydrus-447.ebuild b/media-gfx/hydrus/hydrus-447.ebuild
index c735f0ac9e1..ff24bd7b24a 100644
--- a/media-gfx/hydrus/hydrus-447.ebuild
+++ b/media-gfx/hydrus/hydrus-447.ebuild
@@ -25,11 +25,15 @@ fi
 # icons included are CC-BY-2.5
 LICENSE="WTFPL-2 CC-BY-2.5"
 SLOT="0"
-IUSE="+mpv +ffmpeg +lz4 socks +cloudscraper charts test"
+IUSE="+cloudscraper +ffmpeg +lz4 charts socks test +mpv"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RESTRICT="!test? ( test )"
 
+# RDEPEND is sorted as such:
+# - No specific requirements
+# - Specific version or slot
+# - Depends on use flags
 RDEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
@@ -123,14 +127,14 @@ src_install() {
 	# These files are copied into doc
 	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
 	# The program expects to find documentation here, so add a symlink to doc
-	ln -s "${doc}/html/help" help || die
+	dosym "${doc}/html/help" help
 
 	insinto /opt/hydrus
 	doins -r "${S}"/.
 
 	exeinto /usr/bin
-	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server")
-	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client")
+	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
+	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
 
 	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
 					   "AudioVideo;FileTools;Graphics;Network;"

diff --git a/media-gfx/hydrus/hydrus-448.ebuild b/media-gfx/hydrus/hydrus-448.ebuild
index c735f0ac9e1..ff24bd7b24a 100644
--- a/media-gfx/hydrus/hydrus-448.ebuild
+++ b/media-gfx/hydrus/hydrus-448.ebuild
@@ -25,11 +25,15 @@ fi
 # icons included are CC-BY-2.5
 LICENSE="WTFPL-2 CC-BY-2.5"
 SLOT="0"
-IUSE="+mpv +ffmpeg +lz4 socks +cloudscraper charts test"
+IUSE="+cloudscraper +ffmpeg +lz4 charts socks test +mpv"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RESTRICT="!test? ( test )"
 
+# RDEPEND is sorted as such:
+# - No specific requirements
+# - Specific version or slot
+# - Depends on use flags
 RDEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
@@ -123,14 +127,14 @@ src_install() {
 	# These files are copied into doc
 	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
 	# The program expects to find documentation here, so add a symlink to doc
-	ln -s "${doc}/html/help" help || die
+	dosym "${doc}/html/help" help
 
 	insinto /opt/hydrus
 	doins -r "${S}"/.
 
 	exeinto /usr/bin
-	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server")
-	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client")
+	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
+	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
 
 	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
 					   "AudioVideo;FileTools;Graphics;Network;"

diff --git a/media-gfx/hydrus/hydrus-9999.ebuild b/media-gfx/hydrus/hydrus-9999.ebuild
index c735f0ac9e1..ff24bd7b24a 100644
--- a/media-gfx/hydrus/hydrus-9999.ebuild
+++ b/media-gfx/hydrus/hydrus-9999.ebuild
@@ -25,11 +25,15 @@ fi
 # icons included are CC-BY-2.5
 LICENSE="WTFPL-2 CC-BY-2.5"
 SLOT="0"
-IUSE="+mpv +ffmpeg +lz4 socks +cloudscraper charts test"
+IUSE="+cloudscraper +ffmpeg +lz4 charts socks test +mpv"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RESTRICT="!test? ( test )"
 
+# RDEPEND is sorted as such:
+# - No specific requirements
+# - Specific version or slot
+# - Depends on use flags
 RDEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
@@ -123,14 +127,14 @@ src_install() {
 	# These files are copied into doc
 	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
 	# The program expects to find documentation here, so add a symlink to doc
-	ln -s "${doc}/html/help" help || die
+	dosym "${doc}/html/help" help
 
 	insinto /opt/hydrus
 	doins -r "${S}"/.
 
 	exeinto /usr/bin
-	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server")
-	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client")
+	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
+	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
 
 	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
 					   "AudioVideo;FileTools;Graphics;Network;"


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2021-08-02  3:34 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2021-08-02  3:34 UTC (permalink / raw
  To: gentoo-commits

commit:     3c9c22985fd11119d54ad8cbbb45abeb18aeff06
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Thu Jul 29 19:34:12 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug  2 03:34:35 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c9c2298

media-gfx/hydrus: Add 448

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/Manifest          |   1 +
 media-gfx/hydrus/hydrus-448.ebuild | 141 +++++++++++++++++++++++++++++++++++++
 2 files changed, 142 insertions(+)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 4fb07b1be72..b47eff0591d 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,3 +1,4 @@
 DIST hydrus-445.tar.gz 38823389 BLAKE2B 3cd07a3e30e60bd8507fd58c027e5c5a96745163bd5982198448a65b957ff8f4308c9bc0ee73b883fa275689c900dff07f497634c07f4b2f7fe579e1e3d6f378 SHA512 6735468bd531786fef9a861a81ee1e34595c362450027a0c011593465ed77dc85a304a314dcb7031e30b2e90548b2497bb4f01932dc1f04e814b7dd5ae70617c
 DIST hydrus-446.tar.gz 38830223 BLAKE2B 5ab44f9cfbd15eb10144135eb4cc1d8493c20f2a931db4332a61aa186fddff96cb3a3b29eb2b210f070bb4be8210d552beb2578a7287a169a7364f02363e05f4 SHA512 bdbcd1177c3bf6ee85089e1a653587bae41c524bc2313bb5d481dee074c7da1c533a91957dc3b03d1c0b515e705809887e290ac71b866a51664f2a9a34bbfb6b
 DIST hydrus-447.tar.gz 38833157 BLAKE2B 8d7cf37a1419ef40fa7816958a01421ecc335d2a8c975fcf16d3ea5dfbdb76d872e4e597bdbade28eff7727914de5de7fb6ffcc7ecc27a712410031efa8433fe SHA512 85eaab40f192f2414be828545464811af2590b55e1a2fea7bbf64f27e4bb9a8b6c6c86cb25c1f7e9f48449173f079dcd749ea25ed22559bebb11adddce62da94
+DIST hydrus-448.tar.gz 38851906 BLAKE2B 2b60174ffea3dd0c3816afef12378546582dfc39f80406534fa8b868c33052dc8497fa750ed724388467fd9ed4f1a7245b7ef91745750b9ede834a94e2da9638 SHA512 a16879dfd3417a784ca900b6cdab5fb4079d8ca4179224ac69e37321e165f35483d476b40994f2445c846998b2f154498da3cbd9c695a9d96b71f187e788b7b3

diff --git a/media-gfx/hydrus/hydrus-448.ebuild b/media-gfx/hydrus/hydrus-448.ebuild
new file mode 100644
index 00000000000..c735f0ac9e1
--- /dev/null
+++ b/media-gfx/hydrus/hydrus-448.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="sqlite"
+
+inherit python-single-r1 desktop optfeature
+
+DESCRIPTION="A booru-like media organizer for the desktop"
+HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
+else
+	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+# hydrus itself is WTFPL
+# icons included are CC-BY-2.5
+LICENSE="WTFPL-2 CC-BY-2.5"
+SLOT="0"
+IUSE="+mpv +ffmpeg +lz4 socks +cloudscraper charts test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pyside2[widgets,gui,charts?,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/twisted[${PYTHON_USEDEP}]
+		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
+
+		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+
+		cloudscraper? ( dev-python/cloudscraper[${PYTHON_USEDEP}] )
+		ffmpeg? ( media-video/ffmpeg )
+		lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
+		mpv? (
+			media-video/mpv[libmpv,${PYTHON_USEDEP}]
+			dev-python/python-mpv[${PYTHON_USEDEP}]
+		)
+		socks? (
+			|| ( dev-python/requests[socks5,${PYTHON_USEDEP}]
+				dev-python/PySocks[${PYTHON_USEDEP}] )
+		)
+	')
+"
+BDEPEND="
+	${RDEPEND}
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/httmock[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/nose[${PYTHON_USEDEP}]
+		)
+	')
+"
+
+PATCHES=(
+	"${FILESDIR}/userpath-in-local-share.patch"
+)
+
+src_prepare() {
+	default
+
+	# Contains pre-built binaries for other systems and a broken swf renderer for linux
+	rm -r bin/ || die
+	# Build files used for CI, not actually needed
+	rm -r static/build_files || die
+	# Duplicate license file, not needed
+	rm license.txt || die
+	# Python requirements files, not needed
+	rm requirements_*.txt || die
+}
+
+src_compile() {
+	python_optimize "${S}"
+}
+
+src_test() {
+	# The tests use unittest, but are run with a custom runner script.
+	# QT_QPA_PLATFORM is required to make them run without X
+	local -x QT_QPA_PLATFORM=offscreen
+	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
+}
+
+src_install() {
+	local doc="${EPREFIX}/usr/share/doc/${PF}"
+	elog "Hydrus includes an excellent manual, that can either be viewed at"
+	elog "${doc}/html/help/index.html"
+	elog "or accessed through the hydrus help menu."
+
+	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
+
+	local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/)
+	local HTML_DOCS=("${S}"/help/)
+	einstalldocs
+
+	# Files only needed for testing
+	rm test.py hydrus/hydrus_test.py || die
+	rm -r hydrus/test/ static/testing/ || die
+
+	# These files are copied into doc
+	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
+	# The program expects to find documentation here, so add a symlink to doc
+	ln -s "${doc}/html/help" help || die
+
+	insinto /opt/hydrus
+	doins -r "${S}"/.
+
+	exeinto /usr/bin
+	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server")
+	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client")
+
+	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
+					   "AudioVideo;FileTools;Graphics;Network;"
+}
+
+pkg_postinst() {
+	optfeature "support for automatic port forwarding" "net-libs/miniupnpc"
+}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2021-08-09 16:40 Joonas Niilola
  0 siblings, 0 replies; 104+ messages in thread
From: Joonas Niilola @ 2021-08-09 16:40 UTC (permalink / raw
  To: gentoo-commits

commit:     1ebebfd24992c0e1c9c5211d69c7df5d1ff5423c
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Tue Aug  3 08:07:44 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Aug  9 16:40:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ebebfd2

media-gfx/hydrus: Fix dosym location error

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/hydrus/hydrus-445.ebuild | 2 +-
 media-gfx/hydrus/hydrus-446.ebuild | 2 +-
 media-gfx/hydrus/hydrus-447.ebuild | 2 +-
 media-gfx/hydrus/hydrus-448.ebuild | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-gfx/hydrus/hydrus-445.ebuild b/media-gfx/hydrus/hydrus-445.ebuild
index ff24bd7b24a..177f1a8b942 100644
--- a/media-gfx/hydrus/hydrus-445.ebuild
+++ b/media-gfx/hydrus/hydrus-445.ebuild
@@ -127,7 +127,7 @@ src_install() {
 	# These files are copied into doc
 	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
 	# The program expects to find documentation here, so add a symlink to doc
-	dosym "${doc}/html/help" help
+	dosym "${doc}/html/help" /opt/hydrus/help
 
 	insinto /opt/hydrus
 	doins -r "${S}"/.

diff --git a/media-gfx/hydrus/hydrus-446.ebuild b/media-gfx/hydrus/hydrus-446.ebuild
index ff24bd7b24a..177f1a8b942 100644
--- a/media-gfx/hydrus/hydrus-446.ebuild
+++ b/media-gfx/hydrus/hydrus-446.ebuild
@@ -127,7 +127,7 @@ src_install() {
 	# These files are copied into doc
 	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
 	# The program expects to find documentation here, so add a symlink to doc
-	dosym "${doc}/html/help" help
+	dosym "${doc}/html/help" /opt/hydrus/help
 
 	insinto /opt/hydrus
 	doins -r "${S}"/.

diff --git a/media-gfx/hydrus/hydrus-447.ebuild b/media-gfx/hydrus/hydrus-447.ebuild
index ff24bd7b24a..177f1a8b942 100644
--- a/media-gfx/hydrus/hydrus-447.ebuild
+++ b/media-gfx/hydrus/hydrus-447.ebuild
@@ -127,7 +127,7 @@ src_install() {
 	# These files are copied into doc
 	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
 	# The program expects to find documentation here, so add a symlink to doc
-	dosym "${doc}/html/help" help
+	dosym "${doc}/html/help" /opt/hydrus/help
 
 	insinto /opt/hydrus
 	doins -r "${S}"/.

diff --git a/media-gfx/hydrus/hydrus-448.ebuild b/media-gfx/hydrus/hydrus-448.ebuild
index ff24bd7b24a..177f1a8b942 100644
--- a/media-gfx/hydrus/hydrus-448.ebuild
+++ b/media-gfx/hydrus/hydrus-448.ebuild
@@ -127,7 +127,7 @@ src_install() {
 	# These files are copied into doc
 	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
 	# The program expects to find documentation here, so add a symlink to doc
-	dosym "${doc}/html/help" help
+	dosym "${doc}/html/help" /opt/hydrus/help
 
 	insinto /opt/hydrus
 	doins -r "${S}"/.


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2021-08-09 16:40 Joonas Niilola
  0 siblings, 0 replies; 104+ messages in thread
From: Joonas Niilola @ 2021-08-09 16:40 UTC (permalink / raw
  To: gentoo-commits

commit:     9d8db3bd6188bd00d54d53fcd4560a012f4aebbf
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Tue Aug  3 08:18:45 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Aug  9 16:40:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d8db3bd

media-gfx/hydrus: Bump 448 to r1 to force wrong dosym fix

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://github.com/gentoo/gentoo/pull/21865
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/hydrus/{hydrus-448.ebuild => hydrus-448-r1.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/media-gfx/hydrus/hydrus-448.ebuild b/media-gfx/hydrus/hydrus-448-r1.ebuild
similarity index 100%
rename from media-gfx/hydrus/hydrus-448.ebuild
rename to media-gfx/hydrus/hydrus-448-r1.ebuild


^ permalink raw reply	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2021-08-09 16:40 Joonas Niilola
  0 siblings, 0 replies; 104+ messages in thread
From: Joonas Niilola @ 2021-08-09 16:40 UTC (permalink / raw
  To: gentoo-commits

commit:     75677ede87a7f928cf4b6de96c9de5d0c5e75603
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Tue Aug  3 08:14:51 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Aug  9 16:40:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75677ede

media-gfx/hydrus: Drop use flags for optfeature, make some mandatory

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/hydrus/hydrus-445.ebuild  | 26 ++++++++++----------------
 media-gfx/hydrus/hydrus-446.ebuild  | 26 ++++++++++----------------
 media-gfx/hydrus/hydrus-447.ebuild  | 26 ++++++++++----------------
 media-gfx/hydrus/hydrus-448.ebuild  | 26 ++++++++++----------------
 media-gfx/hydrus/hydrus-9999.ebuild | 28 +++++++++++-----------------
 media-gfx/hydrus/metadata.xml       |  8 --------
 6 files changed, 51 insertions(+), 89 deletions(-)

diff --git a/media-gfx/hydrus/hydrus-445.ebuild b/media-gfx/hydrus/hydrus-445.ebuild
index 177f1a8b942..d52bbf98e3b 100644
--- a/media-gfx/hydrus/hydrus-445.ebuild
+++ b/media-gfx/hydrus/hydrus-445.ebuild
@@ -25,7 +25,7 @@ fi
 # icons included are CC-BY-2.5
 LICENSE="WTFPL-2 CC-BY-2.5"
 SLOT="0"
-IUSE="+cloudscraper +ffmpeg +lz4 charts socks test +mpv"
+IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RESTRICT="!test? ( test )"
@@ -33,18 +33,19 @@ RESTRICT="!test? ( test )"
 # RDEPEND is sorted as such:
 # - No specific requirements
 # - Specific version or slot
-# - Depends on use flags
 RDEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
 		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cloudscraper[${PYTHON_USEDEP}]
 		dev-python/html5lib[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/pillow[${PYTHON_USEDEP}]
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyside2[widgets,gui,charts?,${PYTHON_USEDEP}]
+		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
+		dev-python/python-mpv[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/send2trash[${PYTHON_USEDEP}]
@@ -52,21 +53,11 @@ RDEPEND="
 		dev-python/six[${PYTHON_USEDEP}]
 		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/beautifulsoup:4[${PYTHON_USEDEP}]
-
-		cloudscraper? ( dev-python/cloudscraper[${PYTHON_USEDEP}] )
-		ffmpeg? ( media-video/ffmpeg )
-		lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
-		mpv? (
-			media-video/mpv[libmpv,${PYTHON_USEDEP}]
-			dev-python/python-mpv[${PYTHON_USEDEP}]
-		)
-		socks? (
-			|| ( dev-python/requests[socks5,${PYTHON_USEDEP}]
-				dev-python/PySocks[${PYTHON_USEDEP}] )
-		)
 	')
 "
 BDEPEND="
@@ -141,5 +132,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	optfeature "support for automatic port forwarding" "net-libs/miniupnpc"
+	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
+	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
+	optfeature "memory compression in the client" "dev-python/lz4"
+	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
 }

diff --git a/media-gfx/hydrus/hydrus-446.ebuild b/media-gfx/hydrus/hydrus-446.ebuild
index 177f1a8b942..d52bbf98e3b 100644
--- a/media-gfx/hydrus/hydrus-446.ebuild
+++ b/media-gfx/hydrus/hydrus-446.ebuild
@@ -25,7 +25,7 @@ fi
 # icons included are CC-BY-2.5
 LICENSE="WTFPL-2 CC-BY-2.5"
 SLOT="0"
-IUSE="+cloudscraper +ffmpeg +lz4 charts socks test +mpv"
+IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RESTRICT="!test? ( test )"
@@ -33,18 +33,19 @@ RESTRICT="!test? ( test )"
 # RDEPEND is sorted as such:
 # - No specific requirements
 # - Specific version or slot
-# - Depends on use flags
 RDEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
 		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cloudscraper[${PYTHON_USEDEP}]
 		dev-python/html5lib[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/pillow[${PYTHON_USEDEP}]
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyside2[widgets,gui,charts?,${PYTHON_USEDEP}]
+		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
+		dev-python/python-mpv[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/send2trash[${PYTHON_USEDEP}]
@@ -52,21 +53,11 @@ RDEPEND="
 		dev-python/six[${PYTHON_USEDEP}]
 		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/beautifulsoup:4[${PYTHON_USEDEP}]
-
-		cloudscraper? ( dev-python/cloudscraper[${PYTHON_USEDEP}] )
-		ffmpeg? ( media-video/ffmpeg )
-		lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
-		mpv? (
-			media-video/mpv[libmpv,${PYTHON_USEDEP}]
-			dev-python/python-mpv[${PYTHON_USEDEP}]
-		)
-		socks? (
-			|| ( dev-python/requests[socks5,${PYTHON_USEDEP}]
-				dev-python/PySocks[${PYTHON_USEDEP}] )
-		)
 	')
 "
 BDEPEND="
@@ -141,5 +132,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	optfeature "support for automatic port forwarding" "net-libs/miniupnpc"
+	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
+	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
+	optfeature "memory compression in the client" "dev-python/lz4"
+	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
 }

diff --git a/media-gfx/hydrus/hydrus-447.ebuild b/media-gfx/hydrus/hydrus-447.ebuild
index 177f1a8b942..d52bbf98e3b 100644
--- a/media-gfx/hydrus/hydrus-447.ebuild
+++ b/media-gfx/hydrus/hydrus-447.ebuild
@@ -25,7 +25,7 @@ fi
 # icons included are CC-BY-2.5
 LICENSE="WTFPL-2 CC-BY-2.5"
 SLOT="0"
-IUSE="+cloudscraper +ffmpeg +lz4 charts socks test +mpv"
+IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RESTRICT="!test? ( test )"
@@ -33,18 +33,19 @@ RESTRICT="!test? ( test )"
 # RDEPEND is sorted as such:
 # - No specific requirements
 # - Specific version or slot
-# - Depends on use flags
 RDEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
 		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cloudscraper[${PYTHON_USEDEP}]
 		dev-python/html5lib[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/pillow[${PYTHON_USEDEP}]
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyside2[widgets,gui,charts?,${PYTHON_USEDEP}]
+		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
+		dev-python/python-mpv[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/send2trash[${PYTHON_USEDEP}]
@@ -52,21 +53,11 @@ RDEPEND="
 		dev-python/six[${PYTHON_USEDEP}]
 		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/beautifulsoup:4[${PYTHON_USEDEP}]
-
-		cloudscraper? ( dev-python/cloudscraper[${PYTHON_USEDEP}] )
-		ffmpeg? ( media-video/ffmpeg )
-		lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
-		mpv? (
-			media-video/mpv[libmpv,${PYTHON_USEDEP}]
-			dev-python/python-mpv[${PYTHON_USEDEP}]
-		)
-		socks? (
-			|| ( dev-python/requests[socks5,${PYTHON_USEDEP}]
-				dev-python/PySocks[${PYTHON_USEDEP}] )
-		)
 	')
 "
 BDEPEND="
@@ -141,5 +132,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	optfeature "support for automatic port forwarding" "net-libs/miniupnpc"
+	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
+	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
+	optfeature "memory compression in the client" "dev-python/lz4"
+	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
 }

diff --git a/media-gfx/hydrus/hydrus-448.ebuild b/media-gfx/hydrus/hydrus-448.ebuild
index 177f1a8b942..d52bbf98e3b 100644
--- a/media-gfx/hydrus/hydrus-448.ebuild
+++ b/media-gfx/hydrus/hydrus-448.ebuild
@@ -25,7 +25,7 @@ fi
 # icons included are CC-BY-2.5
 LICENSE="WTFPL-2 CC-BY-2.5"
 SLOT="0"
-IUSE="+cloudscraper +ffmpeg +lz4 charts socks test +mpv"
+IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RESTRICT="!test? ( test )"
@@ -33,18 +33,19 @@ RESTRICT="!test? ( test )"
 # RDEPEND is sorted as such:
 # - No specific requirements
 # - Specific version or slot
-# - Depends on use flags
 RDEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
 		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cloudscraper[${PYTHON_USEDEP}]
 		dev-python/html5lib[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/pillow[${PYTHON_USEDEP}]
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyside2[widgets,gui,charts?,${PYTHON_USEDEP}]
+		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
+		dev-python/python-mpv[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/send2trash[${PYTHON_USEDEP}]
@@ -52,21 +53,11 @@ RDEPEND="
 		dev-python/six[${PYTHON_USEDEP}]
 		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/beautifulsoup:4[${PYTHON_USEDEP}]
-
-		cloudscraper? ( dev-python/cloudscraper[${PYTHON_USEDEP}] )
-		ffmpeg? ( media-video/ffmpeg )
-		lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
-		mpv? (
-			media-video/mpv[libmpv,${PYTHON_USEDEP}]
-			dev-python/python-mpv[${PYTHON_USEDEP}]
-		)
-		socks? (
-			|| ( dev-python/requests[socks5,${PYTHON_USEDEP}]
-				dev-python/PySocks[${PYTHON_USEDEP}] )
-		)
 	')
 "
 BDEPEND="
@@ -141,5 +132,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	optfeature "support for automatic port forwarding" "net-libs/miniupnpc"
+	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
+	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
+	optfeature "memory compression in the client" "dev-python/lz4"
+	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
 }

diff --git a/media-gfx/hydrus/hydrus-9999.ebuild b/media-gfx/hydrus/hydrus-9999.ebuild
index ff24bd7b24a..d52bbf98e3b 100644
--- a/media-gfx/hydrus/hydrus-9999.ebuild
+++ b/media-gfx/hydrus/hydrus-9999.ebuild
@@ -25,7 +25,7 @@ fi
 # icons included are CC-BY-2.5
 LICENSE="WTFPL-2 CC-BY-2.5"
 SLOT="0"
-IUSE="+cloudscraper +ffmpeg +lz4 charts socks test +mpv"
+IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RESTRICT="!test? ( test )"
@@ -33,18 +33,19 @@ RESTRICT="!test? ( test )"
 # RDEPEND is sorted as such:
 # - No specific requirements
 # - Specific version or slot
-# - Depends on use flags
 RDEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
 		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cloudscraper[${PYTHON_USEDEP}]
 		dev-python/html5lib[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/pillow[${PYTHON_USEDEP}]
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyside2[widgets,gui,charts?,${PYTHON_USEDEP}]
+		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
+		dev-python/python-mpv[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/send2trash[${PYTHON_USEDEP}]
@@ -52,21 +53,11 @@ RDEPEND="
 		dev-python/six[${PYTHON_USEDEP}]
 		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/beautifulsoup:4[${PYTHON_USEDEP}]
-
-		cloudscraper? ( dev-python/cloudscraper[${PYTHON_USEDEP}] )
-		ffmpeg? ( media-video/ffmpeg )
-		lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
-		mpv? (
-			media-video/mpv[libmpv,${PYTHON_USEDEP}]
-			dev-python/python-mpv[${PYTHON_USEDEP}]
-		)
-		socks? (
-			|| ( dev-python/requests[socks5,${PYTHON_USEDEP}]
-				dev-python/PySocks[${PYTHON_USEDEP}] )
-		)
 	')
 "
 BDEPEND="
@@ -127,7 +118,7 @@ src_install() {
 	# These files are copied into doc
 	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
 	# The program expects to find documentation here, so add a symlink to doc
-	dosym "${doc}/html/help" help
+	dosym "${doc}/html/help" /opt/hydrus/help
 
 	insinto /opt/hydrus
 	doins -r "${S}"/.
@@ -141,5 +132,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	optfeature "support for automatic port forwarding" "net-libs/miniupnpc"
+	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
+	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
+	optfeature "memory compression in the client" "dev-python/lz4"
+	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
 }

diff --git a/media-gfx/hydrus/metadata.xml b/media-gfx/hydrus/metadata.xml
index 0b2b3b92808..d2078fe3945 100644
--- a/media-gfx/hydrus/metadata.xml
+++ b/media-gfx/hydrus/metadata.xml
@@ -14,13 +14,5 @@
 		with tags instead of folders, a little like a booru on your desktop. Advanced users can share tags and files
 		anonymously through custom servers that any user may run
 	</longdescription>
-	<use>
-		<flag name="charts">Support for bandwidth charts</flag>
-		<flag name="cloudscraper">Support working around cloudflare anti-bot page</flag>
-		<flag name="ffmpeg">Show duration and other information on video thumbnails</flag>
-		<flag name="lz4">Enable memory compression in the client</flag>
-		<flag name="mpv">Support playing videos with libmpv</flag>
-		<flag name="socks">Support SOCKS proxies</flag>
-	</use>
 	<stabilize-allarches/>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2021-08-15 17:17 Joonas Niilola
  0 siblings, 0 replies; 104+ messages in thread
From: Joonas Niilola @ 2021-08-15 17:17 UTC (permalink / raw
  To: gentoo-commits

commit:     c4a54de94bed5609af882fce2d37589c64adc8d5
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Fri Aug 13 09:21:43 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Aug 15 17:17:04 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4a54de9

media-gfx/hydrus: Drop 445

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/hydrus/Manifest          |   1 -
 media-gfx/hydrus/hydrus-445.ebuild | 139 -------------------------------------
 2 files changed, 140 deletions(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index b47eff0591d..6250c8e88aa 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,4 +1,3 @@
-DIST hydrus-445.tar.gz 38823389 BLAKE2B 3cd07a3e30e60bd8507fd58c027e5c5a96745163bd5982198448a65b957ff8f4308c9bc0ee73b883fa275689c900dff07f497634c07f4b2f7fe579e1e3d6f378 SHA512 6735468bd531786fef9a861a81ee1e34595c362450027a0c011593465ed77dc85a304a314dcb7031e30b2e90548b2497bb4f01932dc1f04e814b7dd5ae70617c
 DIST hydrus-446.tar.gz 38830223 BLAKE2B 5ab44f9cfbd15eb10144135eb4cc1d8493c20f2a931db4332a61aa186fddff96cb3a3b29eb2b210f070bb4be8210d552beb2578a7287a169a7364f02363e05f4 SHA512 bdbcd1177c3bf6ee85089e1a653587bae41c524bc2313bb5d481dee074c7da1c533a91957dc3b03d1c0b515e705809887e290ac71b866a51664f2a9a34bbfb6b
 DIST hydrus-447.tar.gz 38833157 BLAKE2B 8d7cf37a1419ef40fa7816958a01421ecc335d2a8c975fcf16d3ea5dfbdb76d872e4e597bdbade28eff7727914de5de7fb6ffcc7ecc27a712410031efa8433fe SHA512 85eaab40f192f2414be828545464811af2590b55e1a2fea7bbf64f27e4bb9a8b6c6c86cb25c1f7e9f48449173f079dcd749ea25ed22559bebb11adddce62da94
 DIST hydrus-448.tar.gz 38851906 BLAKE2B 2b60174ffea3dd0c3816afef12378546582dfc39f80406534fa8b868c33052dc8497fa750ed724388467fd9ed4f1a7245b7ef91745750b9ede834a94e2da9638 SHA512 a16879dfd3417a784ca900b6cdab5fb4079d8ca4179224ac69e37321e165f35483d476b40994f2445c846998b2f154498da3cbd9c695a9d96b71f187e788b7b3

diff --git a/media-gfx/hydrus/hydrus-445.ebuild b/media-gfx/hydrus/hydrus-445.ebuild
deleted file mode 100644
index d52bbf98e3b..00000000000
--- a/media-gfx/hydrus/hydrus-445.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="sqlite"
-
-inherit python-single-r1 desktop optfeature
-
-DESCRIPTION="A booru-like media organizer for the desktop"
-HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
-else
-	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-	KEYWORDS="~amd64"
-fi
-
-# hydrus itself is WTFPL
-# icons included are CC-BY-2.5
-LICENSE="WTFPL-2 CC-BY-2.5"
-SLOT="0"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-# RDEPEND is sorted as such:
-# - No specific requirements
-# - Specific version or slot
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cloudscraper[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
-		dev-python/python-mpv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		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/beautifulsoup:4[${PYTHON_USEDEP}]
-	')
-"
-BDEPEND="
-	${RDEPEND}
-	$(python_gen_cond_dep '
-		test? (
-			dev-python/httmock[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/nose[${PYTHON_USEDEP}]
-		)
-	')
-"
-
-PATCHES=(
-	"${FILESDIR}/userpath-in-local-share.patch"
-)
-
-src_prepare() {
-	default
-
-	# Contains pre-built binaries for other systems and a broken swf renderer for linux
-	rm -r bin/ || die
-	# Build files used for CI, not actually needed
-	rm -r static/build_files || die
-	# Duplicate license file, not needed
-	rm license.txt || die
-	# Python requirements files, not needed
-	rm requirements_*.txt || die
-}
-
-src_compile() {
-	python_optimize "${S}"
-}
-
-src_test() {
-	# The tests use unittest, but are run with a custom runner script.
-	# QT_QPA_PLATFORM is required to make them run without X
-	local -x QT_QPA_PLATFORM=offscreen
-	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
-}
-
-src_install() {
-	local doc="${EPREFIX}/usr/share/doc/${PF}"
-	elog "Hydrus includes an excellent manual, that can either be viewed at"
-	elog "${doc}/html/help/index.html"
-	elog "or accessed through the hydrus help menu."
-
-	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
-
-	local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/)
-	local HTML_DOCS=("${S}"/help/)
-	einstalldocs
-
-	# Files only needed for testing
-	rm test.py hydrus/hydrus_test.py || die
-	rm -r hydrus/test/ static/testing/ || die
-
-	# These files are copied into doc
-	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
-	# The program expects to find documentation here, so add a symlink to doc
-	dosym "${doc}/html/help" /opt/hydrus/help
-
-	insinto /opt/hydrus
-	doins -r "${S}"/.
-
-	exeinto /usr/bin
-	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
-	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
-
-	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
-					   "AudioVideo;FileTools;Graphics;Network;"
-}
-
-pkg_postinst() {
-	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
-	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
-	optfeature "memory compression in the client" "dev-python/lz4"
-	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
-}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2021-08-15 17:17 Joonas Niilola
  0 siblings, 0 replies; 104+ messages in thread
From: Joonas Niilola @ 2021-08-15 17:17 UTC (permalink / raw
  To: gentoo-commits

commit:     5a46709ce7feb5bc5f1b1a2374adf7982ea60f41
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Fri Aug 13 09:22:02 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Aug 15 17:17:04 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a46709c

media-gfx/hydrus: Add 450

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://github.com/gentoo/gentoo/pull/21977
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/hydrus/Manifest          |   1 +
 media-gfx/hydrus/hydrus-450.ebuild | 139 +++++++++++++++++++++++++++++++++++++
 2 files changed, 140 insertions(+)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 6250c8e88aa..a1e01bdef8c 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,3 +1,4 @@
 DIST hydrus-446.tar.gz 38830223 BLAKE2B 5ab44f9cfbd15eb10144135eb4cc1d8493c20f2a931db4332a61aa186fddff96cb3a3b29eb2b210f070bb4be8210d552beb2578a7287a169a7364f02363e05f4 SHA512 bdbcd1177c3bf6ee85089e1a653587bae41c524bc2313bb5d481dee074c7da1c533a91957dc3b03d1c0b515e705809887e290ac71b866a51664f2a9a34bbfb6b
 DIST hydrus-447.tar.gz 38833157 BLAKE2B 8d7cf37a1419ef40fa7816958a01421ecc335d2a8c975fcf16d3ea5dfbdb76d872e4e597bdbade28eff7727914de5de7fb6ffcc7ecc27a712410031efa8433fe SHA512 85eaab40f192f2414be828545464811af2590b55e1a2fea7bbf64f27e4bb9a8b6c6c86cb25c1f7e9f48449173f079dcd749ea25ed22559bebb11adddce62da94
 DIST hydrus-448.tar.gz 38851906 BLAKE2B 2b60174ffea3dd0c3816afef12378546582dfc39f80406534fa8b868c33052dc8497fa750ed724388467fd9ed4f1a7245b7ef91745750b9ede834a94e2da9638 SHA512 a16879dfd3417a784ca900b6cdab5fb4079d8ca4179224ac69e37321e165f35483d476b40994f2445c846998b2f154498da3cbd9c695a9d96b71f187e788b7b3
+DIST hydrus-450.tar.gz 38861101 BLAKE2B fd7993a4d9f82da43b4a6ae83426452b8bb79bcc32a9038ff129c4673c618b89db4a79301d06d2cc7c244053904cd201e88d496e05f7fcf723874e929275af08 SHA512 1c55a173863f7fee90288e1bc85203d12aaf812ab4afb506bc72c24d9b25dfea8ef1785043d801c2bea6302c65d4342ec2f58f47927fbb2d274ba433d29d8230

diff --git a/media-gfx/hydrus/hydrus-450.ebuild b/media-gfx/hydrus/hydrus-450.ebuild
new file mode 100644
index 00000000000..d52bbf98e3b
--- /dev/null
+++ b/media-gfx/hydrus/hydrus-450.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="sqlite"
+
+inherit python-single-r1 desktop optfeature
+
+DESCRIPTION="A booru-like media organizer for the desktop"
+HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
+else
+	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+# hydrus itself is WTFPL
+# icons included are CC-BY-2.5
+LICENSE="WTFPL-2 CC-BY-2.5"
+SLOT="0"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+# RDEPEND is sorted as such:
+# - No specific requirements
+# - Specific version or slot
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cloudscraper[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
+		dev-python/python-mpv[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		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/beautifulsoup:4[${PYTHON_USEDEP}]
+	')
+"
+BDEPEND="
+	${RDEPEND}
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/httmock[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/nose[${PYTHON_USEDEP}]
+		)
+	')
+"
+
+PATCHES=(
+	"${FILESDIR}/userpath-in-local-share.patch"
+)
+
+src_prepare() {
+	default
+
+	# Contains pre-built binaries for other systems and a broken swf renderer for linux
+	rm -r bin/ || die
+	# Build files used for CI, not actually needed
+	rm -r static/build_files || die
+	# Duplicate license file, not needed
+	rm license.txt || die
+	# Python requirements files, not needed
+	rm requirements_*.txt || die
+}
+
+src_compile() {
+	python_optimize "${S}"
+}
+
+src_test() {
+	# The tests use unittest, but are run with a custom runner script.
+	# QT_QPA_PLATFORM is required to make them run without X
+	local -x QT_QPA_PLATFORM=offscreen
+	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
+}
+
+src_install() {
+	local doc="${EPREFIX}/usr/share/doc/${PF}"
+	elog "Hydrus includes an excellent manual, that can either be viewed at"
+	elog "${doc}/html/help/index.html"
+	elog "or accessed through the hydrus help menu."
+
+	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
+
+	local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/)
+	local HTML_DOCS=("${S}"/help/)
+	einstalldocs
+
+	# Files only needed for testing
+	rm test.py hydrus/hydrus_test.py || die
+	rm -r hydrus/test/ static/testing/ || die
+
+	# These files are copied into doc
+	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
+	# The program expects to find documentation here, so add a symlink to doc
+	dosym "${doc}/html/help" /opt/hydrus/help
+
+	insinto /opt/hydrus
+	doins -r "${S}"/.
+
+	exeinto /usr/bin
+	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
+	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
+
+	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
+					   "AudioVideo;FileTools;Graphics;Network;"
+}
+
+pkg_postinst() {
+	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
+	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
+	optfeature "memory compression in the client" "dev-python/lz4"
+	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
+}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2021-08-24  8:50 Joonas Niilola
  0 siblings, 0 replies; 104+ messages in thread
From: Joonas Niilola @ 2021-08-24  8:50 UTC (permalink / raw
  To: gentoo-commits

commit:     3a5ca6010aa67015567fa00c99f196eb254790f6
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Thu Aug 19 15:41:40 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Aug 24 08:50:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a5ca601

media-gfx/hydrus: Add 451

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://github.com/gentoo/gentoo/pull/22036
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/hydrus/Manifest          |   1 +
 media-gfx/hydrus/hydrus-451.ebuild | 139 +++++++++++++++++++++++++++++++++++++
 2 files changed, 140 insertions(+)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 726c8e9c9e0..7599c20a42e 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,3 +1,4 @@
 DIST hydrus-447.tar.gz 38833157 BLAKE2B 8d7cf37a1419ef40fa7816958a01421ecc335d2a8c975fcf16d3ea5dfbdb76d872e4e597bdbade28eff7727914de5de7fb6ffcc7ecc27a712410031efa8433fe SHA512 85eaab40f192f2414be828545464811af2590b55e1a2fea7bbf64f27e4bb9a8b6c6c86cb25c1f7e9f48449173f079dcd749ea25ed22559bebb11adddce62da94
 DIST hydrus-448.tar.gz 38851906 BLAKE2B 2b60174ffea3dd0c3816afef12378546582dfc39f80406534fa8b868c33052dc8497fa750ed724388467fd9ed4f1a7245b7ef91745750b9ede834a94e2da9638 SHA512 a16879dfd3417a784ca900b6cdab5fb4079d8ca4179224ac69e37321e165f35483d476b40994f2445c846998b2f154498da3cbd9c695a9d96b71f187e788b7b3
 DIST hydrus-450.tar.gz 38861101 BLAKE2B fd7993a4d9f82da43b4a6ae83426452b8bb79bcc32a9038ff129c4673c618b89db4a79301d06d2cc7c244053904cd201e88d496e05f7fcf723874e929275af08 SHA512 1c55a173863f7fee90288e1bc85203d12aaf812ab4afb506bc72c24d9b25dfea8ef1785043d801c2bea6302c65d4342ec2f58f47927fbb2d274ba433d29d8230
+DIST hydrus-451.tar.gz 38867387 BLAKE2B 80a7139ebcc1447b8eb35754dd65b54127a2b5107bbb8bdb371476f9db984bcd5b9ff388ec726ed5fca31acf69a180c288e1c6cdfabfdef1c72772402d22f3f0 SHA512 482095c03d44979e99e4f3027fa9b6f5c9b90692e29a28246f1e0b4c6fa20c6ed3b1d9e421d3b9bb723a094c1f0aea6aa7468247e23b54570ee99e26dce41654

diff --git a/media-gfx/hydrus/hydrus-451.ebuild b/media-gfx/hydrus/hydrus-451.ebuild
new file mode 100644
index 00000000000..d52bbf98e3b
--- /dev/null
+++ b/media-gfx/hydrus/hydrus-451.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="sqlite"
+
+inherit python-single-r1 desktop optfeature
+
+DESCRIPTION="A booru-like media organizer for the desktop"
+HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
+else
+	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+# hydrus itself is WTFPL
+# icons included are CC-BY-2.5
+LICENSE="WTFPL-2 CC-BY-2.5"
+SLOT="0"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+# RDEPEND is sorted as such:
+# - No specific requirements
+# - Specific version or slot
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cloudscraper[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
+		dev-python/python-mpv[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		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/beautifulsoup:4[${PYTHON_USEDEP}]
+	')
+"
+BDEPEND="
+	${RDEPEND}
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/httmock[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/nose[${PYTHON_USEDEP}]
+		)
+	')
+"
+
+PATCHES=(
+	"${FILESDIR}/userpath-in-local-share.patch"
+)
+
+src_prepare() {
+	default
+
+	# Contains pre-built binaries for other systems and a broken swf renderer for linux
+	rm -r bin/ || die
+	# Build files used for CI, not actually needed
+	rm -r static/build_files || die
+	# Duplicate license file, not needed
+	rm license.txt || die
+	# Python requirements files, not needed
+	rm requirements_*.txt || die
+}
+
+src_compile() {
+	python_optimize "${S}"
+}
+
+src_test() {
+	# The tests use unittest, but are run with a custom runner script.
+	# QT_QPA_PLATFORM is required to make them run without X
+	local -x QT_QPA_PLATFORM=offscreen
+	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
+}
+
+src_install() {
+	local doc="${EPREFIX}/usr/share/doc/${PF}"
+	elog "Hydrus includes an excellent manual, that can either be viewed at"
+	elog "${doc}/html/help/index.html"
+	elog "or accessed through the hydrus help menu."
+
+	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
+
+	local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/)
+	local HTML_DOCS=("${S}"/help/)
+	einstalldocs
+
+	# Files only needed for testing
+	rm test.py hydrus/hydrus_test.py || die
+	rm -r hydrus/test/ static/testing/ || die
+
+	# These files are copied into doc
+	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
+	# The program expects to find documentation here, so add a symlink to doc
+	dosym "${doc}/html/help" /opt/hydrus/help
+
+	insinto /opt/hydrus
+	doins -r "${S}"/.
+
+	exeinto /usr/bin
+	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
+	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
+
+	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
+					   "AudioVideo;FileTools;Graphics;Network;"
+}
+
+pkg_postinst() {
+	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
+	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
+	optfeature "memory compression in the client" "dev-python/lz4"
+	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
+}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2021-08-24  8:50 Joonas Niilola
  0 siblings, 0 replies; 104+ messages in thread
From: Joonas Niilola @ 2021-08-24  8:50 UTC (permalink / raw
  To: gentoo-commits

commit:     1d814cd10f8f1f1884871a4c6426871a4ca45b42
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Thu Aug 19 15:41:16 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Aug 24 08:50:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d814cd1

media-gfx/hydrus: Drop 446

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/hydrus/Manifest          |   1 -
 media-gfx/hydrus/hydrus-446.ebuild | 139 -------------------------------------
 2 files changed, 140 deletions(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index a1e01bdef8c..726c8e9c9e0 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,4 +1,3 @@
-DIST hydrus-446.tar.gz 38830223 BLAKE2B 5ab44f9cfbd15eb10144135eb4cc1d8493c20f2a931db4332a61aa186fddff96cb3a3b29eb2b210f070bb4be8210d552beb2578a7287a169a7364f02363e05f4 SHA512 bdbcd1177c3bf6ee85089e1a653587bae41c524bc2313bb5d481dee074c7da1c533a91957dc3b03d1c0b515e705809887e290ac71b866a51664f2a9a34bbfb6b
 DIST hydrus-447.tar.gz 38833157 BLAKE2B 8d7cf37a1419ef40fa7816958a01421ecc335d2a8c975fcf16d3ea5dfbdb76d872e4e597bdbade28eff7727914de5de7fb6ffcc7ecc27a712410031efa8433fe SHA512 85eaab40f192f2414be828545464811af2590b55e1a2fea7bbf64f27e4bb9a8b6c6c86cb25c1f7e9f48449173f079dcd749ea25ed22559bebb11adddce62da94
 DIST hydrus-448.tar.gz 38851906 BLAKE2B 2b60174ffea3dd0c3816afef12378546582dfc39f80406534fa8b868c33052dc8497fa750ed724388467fd9ed4f1a7245b7ef91745750b9ede834a94e2da9638 SHA512 a16879dfd3417a784ca900b6cdab5fb4079d8ca4179224ac69e37321e165f35483d476b40994f2445c846998b2f154498da3cbd9c695a9d96b71f187e788b7b3
 DIST hydrus-450.tar.gz 38861101 BLAKE2B fd7993a4d9f82da43b4a6ae83426452b8bb79bcc32a9038ff129c4673c618b89db4a79301d06d2cc7c244053904cd201e88d496e05f7fcf723874e929275af08 SHA512 1c55a173863f7fee90288e1bc85203d12aaf812ab4afb506bc72c24d9b25dfea8ef1785043d801c2bea6302c65d4342ec2f58f47927fbb2d274ba433d29d8230

diff --git a/media-gfx/hydrus/hydrus-446.ebuild b/media-gfx/hydrus/hydrus-446.ebuild
deleted file mode 100644
index d52bbf98e3b..00000000000
--- a/media-gfx/hydrus/hydrus-446.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="sqlite"
-
-inherit python-single-r1 desktop optfeature
-
-DESCRIPTION="A booru-like media organizer for the desktop"
-HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
-else
-	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-	KEYWORDS="~amd64"
-fi
-
-# hydrus itself is WTFPL
-# icons included are CC-BY-2.5
-LICENSE="WTFPL-2 CC-BY-2.5"
-SLOT="0"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-# RDEPEND is sorted as such:
-# - No specific requirements
-# - Specific version or slot
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cloudscraper[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
-		dev-python/python-mpv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		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/beautifulsoup:4[${PYTHON_USEDEP}]
-	')
-"
-BDEPEND="
-	${RDEPEND}
-	$(python_gen_cond_dep '
-		test? (
-			dev-python/httmock[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/nose[${PYTHON_USEDEP}]
-		)
-	')
-"
-
-PATCHES=(
-	"${FILESDIR}/userpath-in-local-share.patch"
-)
-
-src_prepare() {
-	default
-
-	# Contains pre-built binaries for other systems and a broken swf renderer for linux
-	rm -r bin/ || die
-	# Build files used for CI, not actually needed
-	rm -r static/build_files || die
-	# Duplicate license file, not needed
-	rm license.txt || die
-	# Python requirements files, not needed
-	rm requirements_*.txt || die
-}
-
-src_compile() {
-	python_optimize "${S}"
-}
-
-src_test() {
-	# The tests use unittest, but are run with a custom runner script.
-	# QT_QPA_PLATFORM is required to make them run without X
-	local -x QT_QPA_PLATFORM=offscreen
-	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
-}
-
-src_install() {
-	local doc="${EPREFIX}/usr/share/doc/${PF}"
-	elog "Hydrus includes an excellent manual, that can either be viewed at"
-	elog "${doc}/html/help/index.html"
-	elog "or accessed through the hydrus help menu."
-
-	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
-
-	local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/)
-	local HTML_DOCS=("${S}"/help/)
-	einstalldocs
-
-	# Files only needed for testing
-	rm test.py hydrus/hydrus_test.py || die
-	rm -r hydrus/test/ static/testing/ || die
-
-	# These files are copied into doc
-	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
-	# The program expects to find documentation here, so add a symlink to doc
-	dosym "${doc}/html/help" /opt/hydrus/help
-
-	insinto /opt/hydrus
-	doins -r "${S}"/.
-
-	exeinto /usr/bin
-	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
-	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
-
-	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
-					   "AudioVideo;FileTools;Graphics;Network;"
-}
-
-pkg_postinst() {
-	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
-	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
-	optfeature "memory compression in the client" "dev-python/lz4"
-	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
-}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2021-08-28 16:50 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2021-08-28 16:50 UTC (permalink / raw
  To: gentoo-commits

commit:     afc14c09b6f873082a9fb72c676d92827411a6b7
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Sat Aug 28 15:19:24 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Aug 28 16:50:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afc14c09

media-gfx/hydrus: Add 452

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://github.com/gentoo/gentoo/pull/22142
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/Manifest          |   1 +
 media-gfx/hydrus/hydrus-452.ebuild | 139 +++++++++++++++++++++++++++++++++++++
 2 files changed, 140 insertions(+)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 54e66ea3816..61118130f14 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,3 +1,4 @@
 DIST hydrus-448.tar.gz 38851906 BLAKE2B 2b60174ffea3dd0c3816afef12378546582dfc39f80406534fa8b868c33052dc8497fa750ed724388467fd9ed4f1a7245b7ef91745750b9ede834a94e2da9638 SHA512 a16879dfd3417a784ca900b6cdab5fb4079d8ca4179224ac69e37321e165f35483d476b40994f2445c846998b2f154498da3cbd9c695a9d96b71f187e788b7b3
 DIST hydrus-450.tar.gz 38861101 BLAKE2B fd7993a4d9f82da43b4a6ae83426452b8bb79bcc32a9038ff129c4673c618b89db4a79301d06d2cc7c244053904cd201e88d496e05f7fcf723874e929275af08 SHA512 1c55a173863f7fee90288e1bc85203d12aaf812ab4afb506bc72c24d9b25dfea8ef1785043d801c2bea6302c65d4342ec2f58f47927fbb2d274ba433d29d8230
 DIST hydrus-451.tar.gz 38867387 BLAKE2B 80a7139ebcc1447b8eb35754dd65b54127a2b5107bbb8bdb371476f9db984bcd5b9ff388ec726ed5fca31acf69a180c288e1c6cdfabfdef1c72772402d22f3f0 SHA512 482095c03d44979e99e4f3027fa9b6f5c9b90692e29a28246f1e0b4c6fa20c6ed3b1d9e421d3b9bb723a094c1f0aea6aa7468247e23b54570ee99e26dce41654
+DIST hydrus-452.tar.gz 38873698 BLAKE2B 3c9c5fc63533f9c94ff3425b8767bffacb20c435f7a904de1229ec3cb079d86009c971515461d55f947743c705b12eee798160cbae04f0c3af283666a82ac482 SHA512 5c0280ae80b9af32629f6a2bcab3466abd01eea502034ac2354e3efabfd7bbe5ae5582950a19d9f28019b993f847000aa194a0b810f4d32b143b24e589de9f66

diff --git a/media-gfx/hydrus/hydrus-452.ebuild b/media-gfx/hydrus/hydrus-452.ebuild
new file mode 100644
index 00000000000..d52bbf98e3b
--- /dev/null
+++ b/media-gfx/hydrus/hydrus-452.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="sqlite"
+
+inherit python-single-r1 desktop optfeature
+
+DESCRIPTION="A booru-like media organizer for the desktop"
+HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
+else
+	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+# hydrus itself is WTFPL
+# icons included are CC-BY-2.5
+LICENSE="WTFPL-2 CC-BY-2.5"
+SLOT="0"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+# RDEPEND is sorted as such:
+# - No specific requirements
+# - Specific version or slot
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cloudscraper[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
+		dev-python/python-mpv[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		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/beautifulsoup:4[${PYTHON_USEDEP}]
+	')
+"
+BDEPEND="
+	${RDEPEND}
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/httmock[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/nose[${PYTHON_USEDEP}]
+		)
+	')
+"
+
+PATCHES=(
+	"${FILESDIR}/userpath-in-local-share.patch"
+)
+
+src_prepare() {
+	default
+
+	# Contains pre-built binaries for other systems and a broken swf renderer for linux
+	rm -r bin/ || die
+	# Build files used for CI, not actually needed
+	rm -r static/build_files || die
+	# Duplicate license file, not needed
+	rm license.txt || die
+	# Python requirements files, not needed
+	rm requirements_*.txt || die
+}
+
+src_compile() {
+	python_optimize "${S}"
+}
+
+src_test() {
+	# The tests use unittest, but are run with a custom runner script.
+	# QT_QPA_PLATFORM is required to make them run without X
+	local -x QT_QPA_PLATFORM=offscreen
+	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
+}
+
+src_install() {
+	local doc="${EPREFIX}/usr/share/doc/${PF}"
+	elog "Hydrus includes an excellent manual, that can either be viewed at"
+	elog "${doc}/html/help/index.html"
+	elog "or accessed through the hydrus help menu."
+
+	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
+
+	local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/)
+	local HTML_DOCS=("${S}"/help/)
+	einstalldocs
+
+	# Files only needed for testing
+	rm test.py hydrus/hydrus_test.py || die
+	rm -r hydrus/test/ static/testing/ || die
+
+	# These files are copied into doc
+	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
+	# The program expects to find documentation here, so add a symlink to doc
+	dosym "${doc}/html/help" /opt/hydrus/help
+
+	insinto /opt/hydrus
+	doins -r "${S}"/.
+
+	exeinto /usr/bin
+	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
+	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
+
+	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
+					   "AudioVideo;FileTools;Graphics;Network;"
+}
+
+pkg_postinst() {
+	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
+	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
+	optfeature "memory compression in the client" "dev-python/lz4"
+	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
+}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2021-08-28 16:50 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2021-08-28 16:50 UTC (permalink / raw
  To: gentoo-commits

commit:     13a6ca7c8e11c6937a188d2a3c49c49b48b206b6
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Sat Aug 28 15:19:00 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Aug 28 16:50:23 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13a6ca7c

media-gfx/hydrus: Drop 447

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/Manifest          |   1 -
 media-gfx/hydrus/hydrus-447.ebuild | 139 -------------------------------------
 2 files changed, 140 deletions(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 7599c20a42e..54e66ea3816 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,4 +1,3 @@
-DIST hydrus-447.tar.gz 38833157 BLAKE2B 8d7cf37a1419ef40fa7816958a01421ecc335d2a8c975fcf16d3ea5dfbdb76d872e4e597bdbade28eff7727914de5de7fb6ffcc7ecc27a712410031efa8433fe SHA512 85eaab40f192f2414be828545464811af2590b55e1a2fea7bbf64f27e4bb9a8b6c6c86cb25c1f7e9f48449173f079dcd749ea25ed22559bebb11adddce62da94
 DIST hydrus-448.tar.gz 38851906 BLAKE2B 2b60174ffea3dd0c3816afef12378546582dfc39f80406534fa8b868c33052dc8497fa750ed724388467fd9ed4f1a7245b7ef91745750b9ede834a94e2da9638 SHA512 a16879dfd3417a784ca900b6cdab5fb4079d8ca4179224ac69e37321e165f35483d476b40994f2445c846998b2f154498da3cbd9c695a9d96b71f187e788b7b3
 DIST hydrus-450.tar.gz 38861101 BLAKE2B fd7993a4d9f82da43b4a6ae83426452b8bb79bcc32a9038ff129c4673c618b89db4a79301d06d2cc7c244053904cd201e88d496e05f7fcf723874e929275af08 SHA512 1c55a173863f7fee90288e1bc85203d12aaf812ab4afb506bc72c24d9b25dfea8ef1785043d801c2bea6302c65d4342ec2f58f47927fbb2d274ba433d29d8230
 DIST hydrus-451.tar.gz 38867387 BLAKE2B 80a7139ebcc1447b8eb35754dd65b54127a2b5107bbb8bdb371476f9db984bcd5b9ff388ec726ed5fca31acf69a180c288e1c6cdfabfdef1c72772402d22f3f0 SHA512 482095c03d44979e99e4f3027fa9b6f5c9b90692e29a28246f1e0b4c6fa20c6ed3b1d9e421d3b9bb723a094c1f0aea6aa7468247e23b54570ee99e26dce41654

diff --git a/media-gfx/hydrus/hydrus-447.ebuild b/media-gfx/hydrus/hydrus-447.ebuild
deleted file mode 100644
index d52bbf98e3b..00000000000
--- a/media-gfx/hydrus/hydrus-447.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="sqlite"
-
-inherit python-single-r1 desktop optfeature
-
-DESCRIPTION="A booru-like media organizer for the desktop"
-HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
-else
-	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-	KEYWORDS="~amd64"
-fi
-
-# hydrus itself is WTFPL
-# icons included are CC-BY-2.5
-LICENSE="WTFPL-2 CC-BY-2.5"
-SLOT="0"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-# RDEPEND is sorted as such:
-# - No specific requirements
-# - Specific version or slot
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cloudscraper[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
-		dev-python/python-mpv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		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/beautifulsoup:4[${PYTHON_USEDEP}]
-	')
-"
-BDEPEND="
-	${RDEPEND}
-	$(python_gen_cond_dep '
-		test? (
-			dev-python/httmock[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/nose[${PYTHON_USEDEP}]
-		)
-	')
-"
-
-PATCHES=(
-	"${FILESDIR}/userpath-in-local-share.patch"
-)
-
-src_prepare() {
-	default
-
-	# Contains pre-built binaries for other systems and a broken swf renderer for linux
-	rm -r bin/ || die
-	# Build files used for CI, not actually needed
-	rm -r static/build_files || die
-	# Duplicate license file, not needed
-	rm license.txt || die
-	# Python requirements files, not needed
-	rm requirements_*.txt || die
-}
-
-src_compile() {
-	python_optimize "${S}"
-}
-
-src_test() {
-	# The tests use unittest, but are run with a custom runner script.
-	# QT_QPA_PLATFORM is required to make them run without X
-	local -x QT_QPA_PLATFORM=offscreen
-	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
-}
-
-src_install() {
-	local doc="${EPREFIX}/usr/share/doc/${PF}"
-	elog "Hydrus includes an excellent manual, that can either be viewed at"
-	elog "${doc}/html/help/index.html"
-	elog "or accessed through the hydrus help menu."
-
-	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
-
-	local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/)
-	local HTML_DOCS=("${S}"/help/)
-	einstalldocs
-
-	# Files only needed for testing
-	rm test.py hydrus/hydrus_test.py || die
-	rm -r hydrus/test/ static/testing/ || die
-
-	# These files are copied into doc
-	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
-	# The program expects to find documentation here, so add a symlink to doc
-	dosym "${doc}/html/help" /opt/hydrus/help
-
-	insinto /opt/hydrus
-	doins -r "${S}"/.
-
-	exeinto /usr/bin
-	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
-	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
-
-	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
-					   "AudioVideo;FileTools;Graphics;Network;"
-}
-
-pkg_postinst() {
-	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
-	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
-	optfeature "memory compression in the client" "dev-python/lz4"
-	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
-}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2021-09-04 11:50 Joonas Niilola
  0 siblings, 0 replies; 104+ messages in thread
From: Joonas Niilola @ 2021-09-04 11:50 UTC (permalink / raw
  To: gentoo-commits

commit:     170e9bfd9a3b0129fe0f2e18ed8f21a07511effb
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Thu Sep  2 14:34:43 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Sep  4 11:50:26 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=170e9bfd

media-gfx/hydrus: Drop 448-r1

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/hydrus/Manifest             |   1 -
 media-gfx/hydrus/hydrus-448-r1.ebuild | 139 ----------------------------------
 2 files changed, 140 deletions(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 61118130f14..7255fc55ac5 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,4 +1,3 @@
-DIST hydrus-448.tar.gz 38851906 BLAKE2B 2b60174ffea3dd0c3816afef12378546582dfc39f80406534fa8b868c33052dc8497fa750ed724388467fd9ed4f1a7245b7ef91745750b9ede834a94e2da9638 SHA512 a16879dfd3417a784ca900b6cdab5fb4079d8ca4179224ac69e37321e165f35483d476b40994f2445c846998b2f154498da3cbd9c695a9d96b71f187e788b7b3
 DIST hydrus-450.tar.gz 38861101 BLAKE2B fd7993a4d9f82da43b4a6ae83426452b8bb79bcc32a9038ff129c4673c618b89db4a79301d06d2cc7c244053904cd201e88d496e05f7fcf723874e929275af08 SHA512 1c55a173863f7fee90288e1bc85203d12aaf812ab4afb506bc72c24d9b25dfea8ef1785043d801c2bea6302c65d4342ec2f58f47927fbb2d274ba433d29d8230
 DIST hydrus-451.tar.gz 38867387 BLAKE2B 80a7139ebcc1447b8eb35754dd65b54127a2b5107bbb8bdb371476f9db984bcd5b9ff388ec726ed5fca31acf69a180c288e1c6cdfabfdef1c72772402d22f3f0 SHA512 482095c03d44979e99e4f3027fa9b6f5c9b90692e29a28246f1e0b4c6fa20c6ed3b1d9e421d3b9bb723a094c1f0aea6aa7468247e23b54570ee99e26dce41654
 DIST hydrus-452.tar.gz 38873698 BLAKE2B 3c9c5fc63533f9c94ff3425b8767bffacb20c435f7a904de1229ec3cb079d86009c971515461d55f947743c705b12eee798160cbae04f0c3af283666a82ac482 SHA512 5c0280ae80b9af32629f6a2bcab3466abd01eea502034ac2354e3efabfd7bbe5ae5582950a19d9f28019b993f847000aa194a0b810f4d32b143b24e589de9f66

diff --git a/media-gfx/hydrus/hydrus-448-r1.ebuild b/media-gfx/hydrus/hydrus-448-r1.ebuild
deleted file mode 100644
index d52bbf98e3b..00000000000
--- a/media-gfx/hydrus/hydrus-448-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="sqlite"
-
-inherit python-single-r1 desktop optfeature
-
-DESCRIPTION="A booru-like media organizer for the desktop"
-HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
-else
-	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-	KEYWORDS="~amd64"
-fi
-
-# hydrus itself is WTFPL
-# icons included are CC-BY-2.5
-LICENSE="WTFPL-2 CC-BY-2.5"
-SLOT="0"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-# RDEPEND is sorted as such:
-# - No specific requirements
-# - Specific version or slot
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cloudscraper[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
-		dev-python/python-mpv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		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/beautifulsoup:4[${PYTHON_USEDEP}]
-	')
-"
-BDEPEND="
-	${RDEPEND}
-	$(python_gen_cond_dep '
-		test? (
-			dev-python/httmock[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/nose[${PYTHON_USEDEP}]
-		)
-	')
-"
-
-PATCHES=(
-	"${FILESDIR}/userpath-in-local-share.patch"
-)
-
-src_prepare() {
-	default
-
-	# Contains pre-built binaries for other systems and a broken swf renderer for linux
-	rm -r bin/ || die
-	# Build files used for CI, not actually needed
-	rm -r static/build_files || die
-	# Duplicate license file, not needed
-	rm license.txt || die
-	# Python requirements files, not needed
-	rm requirements_*.txt || die
-}
-
-src_compile() {
-	python_optimize "${S}"
-}
-
-src_test() {
-	# The tests use unittest, but are run with a custom runner script.
-	# QT_QPA_PLATFORM is required to make them run without X
-	local -x QT_QPA_PLATFORM=offscreen
-	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
-}
-
-src_install() {
-	local doc="${EPREFIX}/usr/share/doc/${PF}"
-	elog "Hydrus includes an excellent manual, that can either be viewed at"
-	elog "${doc}/html/help/index.html"
-	elog "or accessed through the hydrus help menu."
-
-	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
-
-	local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/)
-	local HTML_DOCS=("${S}"/help/)
-	einstalldocs
-
-	# Files only needed for testing
-	rm test.py hydrus/hydrus_test.py || die
-	rm -r hydrus/test/ static/testing/ || die
-
-	# These files are copied into doc
-	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
-	# The program expects to find documentation here, so add a symlink to doc
-	dosym "${doc}/html/help" /opt/hydrus/help
-
-	insinto /opt/hydrus
-	doins -r "${S}"/.
-
-	exeinto /usr/bin
-	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
-	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
-
-	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
-					   "AudioVideo;FileTools;Graphics;Network;"
-}
-
-pkg_postinst() {
-	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
-	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
-	optfeature "memory compression in the client" "dev-python/lz4"
-	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
-}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2021-09-04 11:50 Joonas Niilola
  0 siblings, 0 replies; 104+ messages in thread
From: Joonas Niilola @ 2021-09-04 11:50 UTC (permalink / raw
  To: gentoo-commits

commit:     d9e05e5ee14fc2ebd6d638e0babbce7765da3928
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Thu Sep  2 14:35:14 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Sep  4 11:50:26 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9e05e5e

media-gfx/hydrus: Add 453

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://github.com/gentoo/gentoo/pull/22193
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/hydrus/Manifest          |   1 +
 media-gfx/hydrus/hydrus-453.ebuild | 139 +++++++++++++++++++++++++++++++++++++
 2 files changed, 140 insertions(+)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 7255fc55ac5..344e76749b3 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,3 +1,4 @@
 DIST hydrus-450.tar.gz 38861101 BLAKE2B fd7993a4d9f82da43b4a6ae83426452b8bb79bcc32a9038ff129c4673c618b89db4a79301d06d2cc7c244053904cd201e88d496e05f7fcf723874e929275af08 SHA512 1c55a173863f7fee90288e1bc85203d12aaf812ab4afb506bc72c24d9b25dfea8ef1785043d801c2bea6302c65d4342ec2f58f47927fbb2d274ba433d29d8230
 DIST hydrus-451.tar.gz 38867387 BLAKE2B 80a7139ebcc1447b8eb35754dd65b54127a2b5107bbb8bdb371476f9db984bcd5b9ff388ec726ed5fca31acf69a180c288e1c6cdfabfdef1c72772402d22f3f0 SHA512 482095c03d44979e99e4f3027fa9b6f5c9b90692e29a28246f1e0b4c6fa20c6ed3b1d9e421d3b9bb723a094c1f0aea6aa7468247e23b54570ee99e26dce41654
 DIST hydrus-452.tar.gz 38873698 BLAKE2B 3c9c5fc63533f9c94ff3425b8767bffacb20c435f7a904de1229ec3cb079d86009c971515461d55f947743c705b12eee798160cbae04f0c3af283666a82ac482 SHA512 5c0280ae80b9af32629f6a2bcab3466abd01eea502034ac2354e3efabfd7bbe5ae5582950a19d9f28019b993f847000aa194a0b810f4d32b143b24e589de9f66
+DIST hydrus-453.tar.gz 38880317 BLAKE2B 93b29d3c973aa583cb6dd32abf94df199aefa9c49137b8137e144a891fbdf9db1cdfb0ec4d378d35e0a07d488a94828bb261c26de3b61b5460d208921c56d194 SHA512 6da364c6f9de9f838d9b3dcc02107bd3d089fde420f4e04086f094e47246e6949c27791a816dc99659db77acad3ca8f7578dc16749eb8b13cfafd7b6c044f5a1

diff --git a/media-gfx/hydrus/hydrus-453.ebuild b/media-gfx/hydrus/hydrus-453.ebuild
new file mode 100644
index 00000000000..d52bbf98e3b
--- /dev/null
+++ b/media-gfx/hydrus/hydrus-453.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="sqlite"
+
+inherit python-single-r1 desktop optfeature
+
+DESCRIPTION="A booru-like media organizer for the desktop"
+HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
+else
+	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+# hydrus itself is WTFPL
+# icons included are CC-BY-2.5
+LICENSE="WTFPL-2 CC-BY-2.5"
+SLOT="0"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+# RDEPEND is sorted as such:
+# - No specific requirements
+# - Specific version or slot
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cloudscraper[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
+		dev-python/python-mpv[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		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/beautifulsoup:4[${PYTHON_USEDEP}]
+	')
+"
+BDEPEND="
+	${RDEPEND}
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/httmock[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/nose[${PYTHON_USEDEP}]
+		)
+	')
+"
+
+PATCHES=(
+	"${FILESDIR}/userpath-in-local-share.patch"
+)
+
+src_prepare() {
+	default
+
+	# Contains pre-built binaries for other systems and a broken swf renderer for linux
+	rm -r bin/ || die
+	# Build files used for CI, not actually needed
+	rm -r static/build_files || die
+	# Duplicate license file, not needed
+	rm license.txt || die
+	# Python requirements files, not needed
+	rm requirements_*.txt || die
+}
+
+src_compile() {
+	python_optimize "${S}"
+}
+
+src_test() {
+	# The tests use unittest, but are run with a custom runner script.
+	# QT_QPA_PLATFORM is required to make them run without X
+	local -x QT_QPA_PLATFORM=offscreen
+	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
+}
+
+src_install() {
+	local doc="${EPREFIX}/usr/share/doc/${PF}"
+	elog "Hydrus includes an excellent manual, that can either be viewed at"
+	elog "${doc}/html/help/index.html"
+	elog "or accessed through the hydrus help menu."
+
+	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
+
+	local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/)
+	local HTML_DOCS=("${S}"/help/)
+	einstalldocs
+
+	# Files only needed for testing
+	rm test.py hydrus/hydrus_test.py || die
+	rm -r hydrus/test/ static/testing/ || die
+
+	# These files are copied into doc
+	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
+	# The program expects to find documentation here, so add a symlink to doc
+	dosym "${doc}/html/help" /opt/hydrus/help
+
+	insinto /opt/hydrus
+	doins -r "${S}"/.
+
+	exeinto /usr/bin
+	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
+	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
+
+	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
+					   "AudioVideo;FileTools;Graphics;Network;"
+}
+
+pkg_postinst() {
+	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
+	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
+	optfeature "memory compression in the client" "dev-python/lz4"
+	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
+}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2021-09-10  7:22 Joonas Niilola
  0 siblings, 0 replies; 104+ messages in thread
From: Joonas Niilola @ 2021-09-10  7:22 UTC (permalink / raw
  To: gentoo-commits

commit:     fdfc3257adae3dda855fc016127be1e2c39d973c
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Thu Sep  9 11:00:17 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Sep 10 07:22:26 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdfc3257

media-gfx/hydrus: Drop 450

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/hydrus/Manifest          |   1 -
 media-gfx/hydrus/hydrus-450.ebuild | 139 -------------------------------------
 2 files changed, 140 deletions(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 344e76749b3..0e7ecc4140d 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,4 +1,3 @@
-DIST hydrus-450.tar.gz 38861101 BLAKE2B fd7993a4d9f82da43b4a6ae83426452b8bb79bcc32a9038ff129c4673c618b89db4a79301d06d2cc7c244053904cd201e88d496e05f7fcf723874e929275af08 SHA512 1c55a173863f7fee90288e1bc85203d12aaf812ab4afb506bc72c24d9b25dfea8ef1785043d801c2bea6302c65d4342ec2f58f47927fbb2d274ba433d29d8230
 DIST hydrus-451.tar.gz 38867387 BLAKE2B 80a7139ebcc1447b8eb35754dd65b54127a2b5107bbb8bdb371476f9db984bcd5b9ff388ec726ed5fca31acf69a180c288e1c6cdfabfdef1c72772402d22f3f0 SHA512 482095c03d44979e99e4f3027fa9b6f5c9b90692e29a28246f1e0b4c6fa20c6ed3b1d9e421d3b9bb723a094c1f0aea6aa7468247e23b54570ee99e26dce41654
 DIST hydrus-452.tar.gz 38873698 BLAKE2B 3c9c5fc63533f9c94ff3425b8767bffacb20c435f7a904de1229ec3cb079d86009c971515461d55f947743c705b12eee798160cbae04f0c3af283666a82ac482 SHA512 5c0280ae80b9af32629f6a2bcab3466abd01eea502034ac2354e3efabfd7bbe5ae5582950a19d9f28019b993f847000aa194a0b810f4d32b143b24e589de9f66
 DIST hydrus-453.tar.gz 38880317 BLAKE2B 93b29d3c973aa583cb6dd32abf94df199aefa9c49137b8137e144a891fbdf9db1cdfb0ec4d378d35e0a07d488a94828bb261c26de3b61b5460d208921c56d194 SHA512 6da364c6f9de9f838d9b3dcc02107bd3d089fde420f4e04086f094e47246e6949c27791a816dc99659db77acad3ca8f7578dc16749eb8b13cfafd7b6c044f5a1

diff --git a/media-gfx/hydrus/hydrus-450.ebuild b/media-gfx/hydrus/hydrus-450.ebuild
deleted file mode 100644
index 0915a2ae543..00000000000
--- a/media-gfx/hydrus/hydrus-450.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="sqlite"
-
-inherit python-single-r1 desktop optfeature
-
-DESCRIPTION="A booru-like media organizer for the desktop"
-HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
-else
-	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-	KEYWORDS="~amd64"
-fi
-
-# hydrus itself is WTFPL
-# icons included are CC-BY-2.5
-LICENSE="WTFPL-2 CC-BY-2.5"
-SLOT="0"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-# RDEPEND is sorted as such:
-# - No specific requirements
-# - Specific version or slot
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cloudscraper[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
-		dev-python/python-mpv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		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}]
-	')
-"
-BDEPEND="
-	${RDEPEND}
-	$(python_gen_cond_dep '
-		test? (
-			dev-python/httmock[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/nose[${PYTHON_USEDEP}]
-		)
-	')
-"
-
-PATCHES=(
-	"${FILESDIR}/userpath-in-local-share.patch"
-)
-
-src_prepare() {
-	default
-
-	# Contains pre-built binaries for other systems and a broken swf renderer for linux
-	rm -r bin/ || die
-	# Build files used for CI, not actually needed
-	rm -r static/build_files || die
-	# Duplicate license file, not needed
-	rm license.txt || die
-	# Python requirements files, not needed
-	rm requirements_*.txt || die
-}
-
-src_compile() {
-	python_optimize "${S}"
-}
-
-src_test() {
-	# The tests use unittest, but are run with a custom runner script.
-	# QT_QPA_PLATFORM is required to make them run without X
-	local -x QT_QPA_PLATFORM=offscreen
-	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
-}
-
-src_install() {
-	local doc="${EPREFIX}/usr/share/doc/${PF}"
-	elog "Hydrus includes an excellent manual, that can either be viewed at"
-	elog "${doc}/html/help/index.html"
-	elog "or accessed through the hydrus help menu."
-
-	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
-
-	local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/)
-	local HTML_DOCS=("${S}"/help/)
-	einstalldocs
-
-	# Files only needed for testing
-	rm test.py hydrus/hydrus_test.py || die
-	rm -r hydrus/test/ static/testing/ || die
-
-	# These files are copied into doc
-	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
-	# The program expects to find documentation here, so add a symlink to doc
-	dosym "${doc}/html/help" /opt/hydrus/help
-
-	insinto /opt/hydrus
-	doins -r "${S}"/.
-
-	exeinto /usr/bin
-	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
-	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
-
-	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
-					   "AudioVideo;FileTools;Graphics;Network;"
-}
-
-pkg_postinst() {
-	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
-	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
-	optfeature "memory compression in the client" "dev-python/lz4"
-	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
-}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2021-09-10  7:22 Joonas Niilola
  0 siblings, 0 replies; 104+ messages in thread
From: Joonas Niilola @ 2021-09-10  7:22 UTC (permalink / raw
  To: gentoo-commits

commit:     0ddc65b9d7da18c96081b5fef4548f2b9e0f054d
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Thu Sep  9 11:00:40 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Sep 10 07:22:26 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ddc65b9

media-gfx/hydrus: Add 454

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://github.com/gentoo/gentoo/pull/22253
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/hydrus/Manifest          |   1 +
 media-gfx/hydrus/hydrus-454.ebuild | 139 +++++++++++++++++++++++++++++++++++++
 2 files changed, 140 insertions(+)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 0e7ecc4140d..2be93a9c5d4 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,3 +1,4 @@
 DIST hydrus-451.tar.gz 38867387 BLAKE2B 80a7139ebcc1447b8eb35754dd65b54127a2b5107bbb8bdb371476f9db984bcd5b9ff388ec726ed5fca31acf69a180c288e1c6cdfabfdef1c72772402d22f3f0 SHA512 482095c03d44979e99e4f3027fa9b6f5c9b90692e29a28246f1e0b4c6fa20c6ed3b1d9e421d3b9bb723a094c1f0aea6aa7468247e23b54570ee99e26dce41654
 DIST hydrus-452.tar.gz 38873698 BLAKE2B 3c9c5fc63533f9c94ff3425b8767bffacb20c435f7a904de1229ec3cb079d86009c971515461d55f947743c705b12eee798160cbae04f0c3af283666a82ac482 SHA512 5c0280ae80b9af32629f6a2bcab3466abd01eea502034ac2354e3efabfd7bbe5ae5582950a19d9f28019b993f847000aa194a0b810f4d32b143b24e589de9f66
 DIST hydrus-453.tar.gz 38880317 BLAKE2B 93b29d3c973aa583cb6dd32abf94df199aefa9c49137b8137e144a891fbdf9db1cdfb0ec4d378d35e0a07d488a94828bb261c26de3b61b5460d208921c56d194 SHA512 6da364c6f9de9f838d9b3dcc02107bd3d089fde420f4e04086f094e47246e6949c27791a816dc99659db77acad3ca8f7578dc16749eb8b13cfafd7b6c044f5a1
+DIST hydrus-454.tar.gz 38886940 BLAKE2B 38fe5b3483c13dfbf82e636be1e743bb6af6f340a86d5ea69f0e71f7452cd3506b076cf4d6f460e0a1896f0839be7494028a0cbb5f567001af025cd436cf5c45 SHA512 87971c45bc11e7eaba2e08255ca23600406124bd73d6d8d4800ec67135a0d74b5ca7fc8a8a159dbdc89f70702760469c8d719de11f5bf943f7679978a790c456

diff --git a/media-gfx/hydrus/hydrus-454.ebuild b/media-gfx/hydrus/hydrus-454.ebuild
new file mode 100644
index 00000000000..0915a2ae543
--- /dev/null
+++ b/media-gfx/hydrus/hydrus-454.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="sqlite"
+
+inherit python-single-r1 desktop optfeature
+
+DESCRIPTION="A booru-like media organizer for the desktop"
+HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
+else
+	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+# hydrus itself is WTFPL
+# icons included are CC-BY-2.5
+LICENSE="WTFPL-2 CC-BY-2.5"
+SLOT="0"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+# RDEPEND is sorted as such:
+# - No specific requirements
+# - Specific version or slot
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cloudscraper[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
+		dev-python/python-mpv[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		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}]
+	')
+"
+BDEPEND="
+	${RDEPEND}
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/httmock[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/nose[${PYTHON_USEDEP}]
+		)
+	')
+"
+
+PATCHES=(
+	"${FILESDIR}/userpath-in-local-share.patch"
+)
+
+src_prepare() {
+	default
+
+	# Contains pre-built binaries for other systems and a broken swf renderer for linux
+	rm -r bin/ || die
+	# Build files used for CI, not actually needed
+	rm -r static/build_files || die
+	# Duplicate license file, not needed
+	rm license.txt || die
+	# Python requirements files, not needed
+	rm requirements_*.txt || die
+}
+
+src_compile() {
+	python_optimize "${S}"
+}
+
+src_test() {
+	# The tests use unittest, but are run with a custom runner script.
+	# QT_QPA_PLATFORM is required to make them run without X
+	local -x QT_QPA_PLATFORM=offscreen
+	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
+}
+
+src_install() {
+	local doc="${EPREFIX}/usr/share/doc/${PF}"
+	elog "Hydrus includes an excellent manual, that can either be viewed at"
+	elog "${doc}/html/help/index.html"
+	elog "or accessed through the hydrus help menu."
+
+	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
+
+	local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/)
+	local HTML_DOCS=("${S}"/help/)
+	einstalldocs
+
+	# Files only needed for testing
+	rm test.py hydrus/hydrus_test.py || die
+	rm -r hydrus/test/ static/testing/ || die
+
+	# These files are copied into doc
+	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
+	# The program expects to find documentation here, so add a symlink to doc
+	dosym "${doc}/html/help" /opt/hydrus/help
+
+	insinto /opt/hydrus
+	doins -r "${S}"/.
+
+	exeinto /usr/bin
+	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
+	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
+
+	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
+					   "AudioVideo;FileTools;Graphics;Network;"
+}
+
+pkg_postinst() {
+	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
+	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
+	optfeature "memory compression in the client" "dev-python/lz4"
+	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
+}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2021-09-10  7:22 Joonas Niilola
  0 siblings, 0 replies; 104+ messages in thread
From: Joonas Niilola @ 2021-09-10  7:22 UTC (permalink / raw
  To: gentoo-commits

commit:     47f39c0e508852789977f137a072fdc465858f93
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 10 07:21:49 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Sep 10 07:22:26 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47f39c0e

media-gfx/hydrus: update EAPI 7 -> 8

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/hydrus/hydrus-454.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/hydrus/hydrus-454.ebuild b/media-gfx/hydrus/hydrus-454.ebuild
index 0915a2ae543..af8a34decb6 100644
--- a/media-gfx/hydrus/hydrus-454.ebuild
+++ b/media-gfx/hydrus/hydrus-454.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="sqlite"


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2021-10-05  4:29 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2021-10-05  4:29 UTC (permalink / raw
  To: gentoo-commits

commit:     577896eb6a5d91037148c01db76ab3e445527c9d
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Sun Oct  3 19:33:52 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct  5 04:29:02 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=577896eb

media-gfx/hydrus: Drop 451, add 456

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://github.com/gentoo/gentoo/pull/22478
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/Manifest                                 | 2 +-
 media-gfx/hydrus/{hydrus-451.ebuild => hydrus-456.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 2be93a9c5d4..fb989c466c3 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,4 +1,4 @@
-DIST hydrus-451.tar.gz 38867387 BLAKE2B 80a7139ebcc1447b8eb35754dd65b54127a2b5107bbb8bdb371476f9db984bcd5b9ff388ec726ed5fca31acf69a180c288e1c6cdfabfdef1c72772402d22f3f0 SHA512 482095c03d44979e99e4f3027fa9b6f5c9b90692e29a28246f1e0b4c6fa20c6ed3b1d9e421d3b9bb723a094c1f0aea6aa7468247e23b54570ee99e26dce41654
 DIST hydrus-452.tar.gz 38873698 BLAKE2B 3c9c5fc63533f9c94ff3425b8767bffacb20c435f7a904de1229ec3cb079d86009c971515461d55f947743c705b12eee798160cbae04f0c3af283666a82ac482 SHA512 5c0280ae80b9af32629f6a2bcab3466abd01eea502034ac2354e3efabfd7bbe5ae5582950a19d9f28019b993f847000aa194a0b810f4d32b143b24e589de9f66
 DIST hydrus-453.tar.gz 38880317 BLAKE2B 93b29d3c973aa583cb6dd32abf94df199aefa9c49137b8137e144a891fbdf9db1cdfb0ec4d378d35e0a07d488a94828bb261c26de3b61b5460d208921c56d194 SHA512 6da364c6f9de9f838d9b3dcc02107bd3d089fde420f4e04086f094e47246e6949c27791a816dc99659db77acad3ca8f7578dc16749eb8b13cfafd7b6c044f5a1
 DIST hydrus-454.tar.gz 38886940 BLAKE2B 38fe5b3483c13dfbf82e636be1e743bb6af6f340a86d5ea69f0e71f7452cd3506b076cf4d6f460e0a1896f0839be7494028a0cbb5f567001af025cd436cf5c45 SHA512 87971c45bc11e7eaba2e08255ca23600406124bd73d6d8d4800ec67135a0d74b5ca7fc8a8a159dbdc89f70702760469c8d719de11f5bf943f7679978a790c456
+DIST hydrus-456.tar.gz 38899003 BLAKE2B 03e575034f2b4234c7f9ed3d4da59a3f94e9e2871440548b192b0898fa7e5d73bf7ab07f91a380db6e884449d6d86df9aed313238f28e1b3c4d7ae4a8f7f00f4 SHA512 de16874aa714a7e3640a9673a1445049256a2a05122f57a8646fd375a295f229c8b262e8c7862bbc7257d8db84a9e4ddf03cf841af307bed30e174e8f159508a

diff --git a/media-gfx/hydrus/hydrus-451.ebuild b/media-gfx/hydrus/hydrus-456.ebuild
similarity index 100%
rename from media-gfx/hydrus/hydrus-451.ebuild
rename to media-gfx/hydrus/hydrus-456.ebuild


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2021-10-20  2:42 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2021-10-20  2:42 UTC (permalink / raw
  To: gentoo-commits

commit:     f1ccfcd8e87d6eb02afb2cb4faf0cd1002b4a7c8
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Sun Oct 10 09:22:22 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 20 02:09:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1ccfcd8

media-gfx/hydrus: Add 457

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/Manifest          |   1 +
 media-gfx/hydrus/hydrus-457.ebuild | 139 +++++++++++++++++++++++++++++++++++++
 2 files changed, 140 insertions(+)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 7cb52849707..adfc45dc575 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,3 +1,4 @@
 DIST hydrus-453.tar.gz 38880317 BLAKE2B 93b29d3c973aa583cb6dd32abf94df199aefa9c49137b8137e144a891fbdf9db1cdfb0ec4d378d35e0a07d488a94828bb261c26de3b61b5460d208921c56d194 SHA512 6da364c6f9de9f838d9b3dcc02107bd3d089fde420f4e04086f094e47246e6949c27791a816dc99659db77acad3ca8f7578dc16749eb8b13cfafd7b6c044f5a1
 DIST hydrus-454.tar.gz 38886940 BLAKE2B 38fe5b3483c13dfbf82e636be1e743bb6af6f340a86d5ea69f0e71f7452cd3506b076cf4d6f460e0a1896f0839be7494028a0cbb5f567001af025cd436cf5c45 SHA512 87971c45bc11e7eaba2e08255ca23600406124bd73d6d8d4800ec67135a0d74b5ca7fc8a8a159dbdc89f70702760469c8d719de11f5bf943f7679978a790c456
 DIST hydrus-456.tar.gz 38899003 BLAKE2B 03e575034f2b4234c7f9ed3d4da59a3f94e9e2871440548b192b0898fa7e5d73bf7ab07f91a380db6e884449d6d86df9aed313238f28e1b3c4d7ae4a8f7f00f4 SHA512 de16874aa714a7e3640a9673a1445049256a2a05122f57a8646fd375a295f229c8b262e8c7862bbc7257d8db84a9e4ddf03cf841af307bed30e174e8f159508a
+DIST hydrus-457.tar.gz 38915780 BLAKE2B 56506ba2098198f42593a061a79f7f6521597f057d87c07eb66b3a213111a46caaf1e167e9f49deaf3d3ffe6259105b6d19cca8fb8fbd0d1c708d796eea63394 SHA512 2a653f69928f4b65cdde332e7be52861527237a284a61ddd0536b6e1db40f91424e78953910dacf494d947a57086cbfbf9588fe638143f386910fb1d7ba1e484

diff --git a/media-gfx/hydrus/hydrus-457.ebuild b/media-gfx/hydrus/hydrus-457.ebuild
new file mode 100644
index 00000000000..0915a2ae543
--- /dev/null
+++ b/media-gfx/hydrus/hydrus-457.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="sqlite"
+
+inherit python-single-r1 desktop optfeature
+
+DESCRIPTION="A booru-like media organizer for the desktop"
+HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
+else
+	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+# hydrus itself is WTFPL
+# icons included are CC-BY-2.5
+LICENSE="WTFPL-2 CC-BY-2.5"
+SLOT="0"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+# RDEPEND is sorted as such:
+# - No specific requirements
+# - Specific version or slot
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cloudscraper[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
+		dev-python/python-mpv[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		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}]
+	')
+"
+BDEPEND="
+	${RDEPEND}
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/httmock[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/nose[${PYTHON_USEDEP}]
+		)
+	')
+"
+
+PATCHES=(
+	"${FILESDIR}/userpath-in-local-share.patch"
+)
+
+src_prepare() {
+	default
+
+	# Contains pre-built binaries for other systems and a broken swf renderer for linux
+	rm -r bin/ || die
+	# Build files used for CI, not actually needed
+	rm -r static/build_files || die
+	# Duplicate license file, not needed
+	rm license.txt || die
+	# Python requirements files, not needed
+	rm requirements_*.txt || die
+}
+
+src_compile() {
+	python_optimize "${S}"
+}
+
+src_test() {
+	# The tests use unittest, but are run with a custom runner script.
+	# QT_QPA_PLATFORM is required to make them run without X
+	local -x QT_QPA_PLATFORM=offscreen
+	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
+}
+
+src_install() {
+	local doc="${EPREFIX}/usr/share/doc/${PF}"
+	elog "Hydrus includes an excellent manual, that can either be viewed at"
+	elog "${doc}/html/help/index.html"
+	elog "or accessed through the hydrus help menu."
+
+	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
+
+	local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/)
+	local HTML_DOCS=("${S}"/help/)
+	einstalldocs
+
+	# Files only needed for testing
+	rm test.py hydrus/hydrus_test.py || die
+	rm -r hydrus/test/ static/testing/ || die
+
+	# These files are copied into doc
+	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
+	# The program expects to find documentation here, so add a symlink to doc
+	dosym "${doc}/html/help" /opt/hydrus/help
+
+	insinto /opt/hydrus
+	doins -r "${S}"/.
+
+	exeinto /usr/bin
+	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
+	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
+
+	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
+					   "AudioVideo;FileTools;Graphics;Network;"
+}
+
+pkg_postinst() {
+	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
+	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
+	optfeature "memory compression in the client" "dev-python/lz4"
+	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
+}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2021-10-20  2:42 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2021-10-20  2:42 UTC (permalink / raw
  To: gentoo-commits

commit:     668cb2333b6127a25610f3b5d3d10b2a47797a57
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Sat Oct 16 16:46:30 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 20 02:10:00 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=668cb233

media-gfx/hydrus: Drop 453

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/Manifest          |   1 -
 media-gfx/hydrus/hydrus-453.ebuild | 139 -------------------------------------
 2 files changed, 140 deletions(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index adfc45dc575..e3fb9ae9607 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,4 +1,3 @@
-DIST hydrus-453.tar.gz 38880317 BLAKE2B 93b29d3c973aa583cb6dd32abf94df199aefa9c49137b8137e144a891fbdf9db1cdfb0ec4d378d35e0a07d488a94828bb261c26de3b61b5460d208921c56d194 SHA512 6da364c6f9de9f838d9b3dcc02107bd3d089fde420f4e04086f094e47246e6949c27791a816dc99659db77acad3ca8f7578dc16749eb8b13cfafd7b6c044f5a1
 DIST hydrus-454.tar.gz 38886940 BLAKE2B 38fe5b3483c13dfbf82e636be1e743bb6af6f340a86d5ea69f0e71f7452cd3506b076cf4d6f460e0a1896f0839be7494028a0cbb5f567001af025cd436cf5c45 SHA512 87971c45bc11e7eaba2e08255ca23600406124bd73d6d8d4800ec67135a0d74b5ca7fc8a8a159dbdc89f70702760469c8d719de11f5bf943f7679978a790c456
 DIST hydrus-456.tar.gz 38899003 BLAKE2B 03e575034f2b4234c7f9ed3d4da59a3f94e9e2871440548b192b0898fa7e5d73bf7ab07f91a380db6e884449d6d86df9aed313238f28e1b3c4d7ae4a8f7f00f4 SHA512 de16874aa714a7e3640a9673a1445049256a2a05122f57a8646fd375a295f229c8b262e8c7862bbc7257d8db84a9e4ddf03cf841af307bed30e174e8f159508a
 DIST hydrus-457.tar.gz 38915780 BLAKE2B 56506ba2098198f42593a061a79f7f6521597f057d87c07eb66b3a213111a46caaf1e167e9f49deaf3d3ffe6259105b6d19cca8fb8fbd0d1c708d796eea63394 SHA512 2a653f69928f4b65cdde332e7be52861527237a284a61ddd0536b6e1db40f91424e78953910dacf494d947a57086cbfbf9588fe638143f386910fb1d7ba1e484

diff --git a/media-gfx/hydrus/hydrus-453.ebuild b/media-gfx/hydrus/hydrus-453.ebuild
deleted file mode 100644
index 0915a2ae543..00000000000
--- a/media-gfx/hydrus/hydrus-453.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="sqlite"
-
-inherit python-single-r1 desktop optfeature
-
-DESCRIPTION="A booru-like media organizer for the desktop"
-HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
-else
-	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-	KEYWORDS="~amd64"
-fi
-
-# hydrus itself is WTFPL
-# icons included are CC-BY-2.5
-LICENSE="WTFPL-2 CC-BY-2.5"
-SLOT="0"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-# RDEPEND is sorted as such:
-# - No specific requirements
-# - Specific version or slot
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cloudscraper[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
-		dev-python/python-mpv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		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}]
-	')
-"
-BDEPEND="
-	${RDEPEND}
-	$(python_gen_cond_dep '
-		test? (
-			dev-python/httmock[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/nose[${PYTHON_USEDEP}]
-		)
-	')
-"
-
-PATCHES=(
-	"${FILESDIR}/userpath-in-local-share.patch"
-)
-
-src_prepare() {
-	default
-
-	# Contains pre-built binaries for other systems and a broken swf renderer for linux
-	rm -r bin/ || die
-	# Build files used for CI, not actually needed
-	rm -r static/build_files || die
-	# Duplicate license file, not needed
-	rm license.txt || die
-	# Python requirements files, not needed
-	rm requirements_*.txt || die
-}
-
-src_compile() {
-	python_optimize "${S}"
-}
-
-src_test() {
-	# The tests use unittest, but are run with a custom runner script.
-	# QT_QPA_PLATFORM is required to make them run without X
-	local -x QT_QPA_PLATFORM=offscreen
-	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
-}
-
-src_install() {
-	local doc="${EPREFIX}/usr/share/doc/${PF}"
-	elog "Hydrus includes an excellent manual, that can either be viewed at"
-	elog "${doc}/html/help/index.html"
-	elog "or accessed through the hydrus help menu."
-
-	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
-
-	local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/)
-	local HTML_DOCS=("${S}"/help/)
-	einstalldocs
-
-	# Files only needed for testing
-	rm test.py hydrus/hydrus_test.py || die
-	rm -r hydrus/test/ static/testing/ || die
-
-	# These files are copied into doc
-	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
-	# The program expects to find documentation here, so add a symlink to doc
-	dosym "${doc}/html/help" /opt/hydrus/help
-
-	insinto /opt/hydrus
-	doins -r "${S}"/.
-
-	exeinto /usr/bin
-	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
-	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
-
-	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
-					   "AudioVideo;FileTools;Graphics;Network;"
-}
-
-pkg_postinst() {
-	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
-	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
-	optfeature "memory compression in the client" "dev-python/lz4"
-	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
-}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2021-10-20  2:42 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2021-10-20  2:42 UTC (permalink / raw
  To: gentoo-commits

commit:     9606f07f689c2f3e7c7566bbc9cd0e4e0810591a
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Sun Oct 10 09:22:02 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 20 02:09:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9606f07f

media-gfx/hydrus: Drop 452

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/Manifest          |   1 -
 media-gfx/hydrus/hydrus-452.ebuild | 139 -------------------------------------
 2 files changed, 140 deletions(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index fb989c466c3..7cb52849707 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,4 +1,3 @@
-DIST hydrus-452.tar.gz 38873698 BLAKE2B 3c9c5fc63533f9c94ff3425b8767bffacb20c435f7a904de1229ec3cb079d86009c971515461d55f947743c705b12eee798160cbae04f0c3af283666a82ac482 SHA512 5c0280ae80b9af32629f6a2bcab3466abd01eea502034ac2354e3efabfd7bbe5ae5582950a19d9f28019b993f847000aa194a0b810f4d32b143b24e589de9f66
 DIST hydrus-453.tar.gz 38880317 BLAKE2B 93b29d3c973aa583cb6dd32abf94df199aefa9c49137b8137e144a891fbdf9db1cdfb0ec4d378d35e0a07d488a94828bb261c26de3b61b5460d208921c56d194 SHA512 6da364c6f9de9f838d9b3dcc02107bd3d089fde420f4e04086f094e47246e6949c27791a816dc99659db77acad3ca8f7578dc16749eb8b13cfafd7b6c044f5a1
 DIST hydrus-454.tar.gz 38886940 BLAKE2B 38fe5b3483c13dfbf82e636be1e743bb6af6f340a86d5ea69f0e71f7452cd3506b076cf4d6f460e0a1896f0839be7494028a0cbb5f567001af025cd436cf5c45 SHA512 87971c45bc11e7eaba2e08255ca23600406124bd73d6d8d4800ec67135a0d74b5ca7fc8a8a159dbdc89f70702760469c8d719de11f5bf943f7679978a790c456
 DIST hydrus-456.tar.gz 38899003 BLAKE2B 03e575034f2b4234c7f9ed3d4da59a3f94e9e2871440548b192b0898fa7e5d73bf7ab07f91a380db6e884449d6d86df9aed313238f28e1b3c4d7ae4a8f7f00f4 SHA512 de16874aa714a7e3640a9673a1445049256a2a05122f57a8646fd375a295f229c8b262e8c7862bbc7257d8db84a9e4ddf03cf841af307bed30e174e8f159508a

diff --git a/media-gfx/hydrus/hydrus-452.ebuild b/media-gfx/hydrus/hydrus-452.ebuild
deleted file mode 100644
index 0915a2ae543..00000000000
--- a/media-gfx/hydrus/hydrus-452.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="sqlite"
-
-inherit python-single-r1 desktop optfeature
-
-DESCRIPTION="A booru-like media organizer for the desktop"
-HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
-else
-	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-	KEYWORDS="~amd64"
-fi
-
-# hydrus itself is WTFPL
-# icons included are CC-BY-2.5
-LICENSE="WTFPL-2 CC-BY-2.5"
-SLOT="0"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-# RDEPEND is sorted as such:
-# - No specific requirements
-# - Specific version or slot
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cloudscraper[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
-		dev-python/python-mpv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		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}]
-	')
-"
-BDEPEND="
-	${RDEPEND}
-	$(python_gen_cond_dep '
-		test? (
-			dev-python/httmock[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/nose[${PYTHON_USEDEP}]
-		)
-	')
-"
-
-PATCHES=(
-	"${FILESDIR}/userpath-in-local-share.patch"
-)
-
-src_prepare() {
-	default
-
-	# Contains pre-built binaries for other systems and a broken swf renderer for linux
-	rm -r bin/ || die
-	# Build files used for CI, not actually needed
-	rm -r static/build_files || die
-	# Duplicate license file, not needed
-	rm license.txt || die
-	# Python requirements files, not needed
-	rm requirements_*.txt || die
-}
-
-src_compile() {
-	python_optimize "${S}"
-}
-
-src_test() {
-	# The tests use unittest, but are run with a custom runner script.
-	# QT_QPA_PLATFORM is required to make them run without X
-	local -x QT_QPA_PLATFORM=offscreen
-	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
-}
-
-src_install() {
-	local doc="${EPREFIX}/usr/share/doc/${PF}"
-	elog "Hydrus includes an excellent manual, that can either be viewed at"
-	elog "${doc}/html/help/index.html"
-	elog "or accessed through the hydrus help menu."
-
-	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
-
-	local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/)
-	local HTML_DOCS=("${S}"/help/)
-	einstalldocs
-
-	# Files only needed for testing
-	rm test.py hydrus/hydrus_test.py || die
-	rm -r hydrus/test/ static/testing/ || die
-
-	# These files are copied into doc
-	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
-	# The program expects to find documentation here, so add a symlink to doc
-	dosym "${doc}/html/help" /opt/hydrus/help
-
-	insinto /opt/hydrus
-	doins -r "${S}"/.
-
-	exeinto /usr/bin
-	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
-	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
-
-	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
-					   "AudioVideo;FileTools;Graphics;Network;"
-}
-
-pkg_postinst() {
-	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
-	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
-	optfeature "memory compression in the client" "dev-python/lz4"
-	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
-}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2021-10-20  2:42 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2021-10-20  2:42 UTC (permalink / raw
  To: gentoo-commits

commit:     f842ea5c7f58b862c66016b1550514b82580dcfe
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Sat Oct 16 16:46:49 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 20 02:10:01 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f842ea5c

media-gfx/hydrus: Add 458

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://github.com/gentoo/gentoo/pull/22540
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/Manifest          |   1 +
 media-gfx/hydrus/hydrus-458.ebuild | 139 +++++++++++++++++++++++++++++++++++++
 2 files changed, 140 insertions(+)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index e3fb9ae9607..5329bab5b60 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,3 +1,4 @@
 DIST hydrus-454.tar.gz 38886940 BLAKE2B 38fe5b3483c13dfbf82e636be1e743bb6af6f340a86d5ea69f0e71f7452cd3506b076cf4d6f460e0a1896f0839be7494028a0cbb5f567001af025cd436cf5c45 SHA512 87971c45bc11e7eaba2e08255ca23600406124bd73d6d8d4800ec67135a0d74b5ca7fc8a8a159dbdc89f70702760469c8d719de11f5bf943f7679978a790c456
 DIST hydrus-456.tar.gz 38899003 BLAKE2B 03e575034f2b4234c7f9ed3d4da59a3f94e9e2871440548b192b0898fa7e5d73bf7ab07f91a380db6e884449d6d86df9aed313238f28e1b3c4d7ae4a8f7f00f4 SHA512 de16874aa714a7e3640a9673a1445049256a2a05122f57a8646fd375a295f229c8b262e8c7862bbc7257d8db84a9e4ddf03cf841af307bed30e174e8f159508a
 DIST hydrus-457.tar.gz 38915780 BLAKE2B 56506ba2098198f42593a061a79f7f6521597f057d87c07eb66b3a213111a46caaf1e167e9f49deaf3d3ffe6259105b6d19cca8fb8fbd0d1c708d796eea63394 SHA512 2a653f69928f4b65cdde332e7be52861527237a284a61ddd0536b6e1db40f91424e78953910dacf494d947a57086cbfbf9588fe638143f386910fb1d7ba1e484
+DIST hydrus-458.tar.gz 38922758 BLAKE2B 3339e44498a606664cd54357cf285f96eb4f146673d9991b9b0fb82bc961b31f4f47c9f27616251b610c4e28664a6b4753aa99713e50d93e79121270796b1408 SHA512 0f2c419012c683c163fd180662eb9d2eb5610a6d87c0cbd42be91dbdf6101e747ba0c6238d1574084a30d1da1c7546a79b0e648fe55420c510d47ab26fad28c3

diff --git a/media-gfx/hydrus/hydrus-458.ebuild b/media-gfx/hydrus/hydrus-458.ebuild
new file mode 100644
index 00000000000..0915a2ae543
--- /dev/null
+++ b/media-gfx/hydrus/hydrus-458.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="sqlite"
+
+inherit python-single-r1 desktop optfeature
+
+DESCRIPTION="A booru-like media organizer for the desktop"
+HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
+else
+	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+# hydrus itself is WTFPL
+# icons included are CC-BY-2.5
+LICENSE="WTFPL-2 CC-BY-2.5"
+SLOT="0"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+# RDEPEND is sorted as such:
+# - No specific requirements
+# - Specific version or slot
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cloudscraper[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
+		dev-python/python-mpv[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		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}]
+	')
+"
+BDEPEND="
+	${RDEPEND}
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/httmock[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/nose[${PYTHON_USEDEP}]
+		)
+	')
+"
+
+PATCHES=(
+	"${FILESDIR}/userpath-in-local-share.patch"
+)
+
+src_prepare() {
+	default
+
+	# Contains pre-built binaries for other systems and a broken swf renderer for linux
+	rm -r bin/ || die
+	# Build files used for CI, not actually needed
+	rm -r static/build_files || die
+	# Duplicate license file, not needed
+	rm license.txt || die
+	# Python requirements files, not needed
+	rm requirements_*.txt || die
+}
+
+src_compile() {
+	python_optimize "${S}"
+}
+
+src_test() {
+	# The tests use unittest, but are run with a custom runner script.
+	# QT_QPA_PLATFORM is required to make them run without X
+	local -x QT_QPA_PLATFORM=offscreen
+	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
+}
+
+src_install() {
+	local doc="${EPREFIX}/usr/share/doc/${PF}"
+	elog "Hydrus includes an excellent manual, that can either be viewed at"
+	elog "${doc}/html/help/index.html"
+	elog "or accessed through the hydrus help menu."
+
+	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
+
+	local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/)
+	local HTML_DOCS=("${S}"/help/)
+	einstalldocs
+
+	# Files only needed for testing
+	rm test.py hydrus/hydrus_test.py || die
+	rm -r hydrus/test/ static/testing/ || die
+
+	# These files are copied into doc
+	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
+	# The program expects to find documentation here, so add a symlink to doc
+	dosym "${doc}/html/help" /opt/hydrus/help
+
+	insinto /opt/hydrus
+	doins -r "${S}"/.
+
+	exeinto /usr/bin
+	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
+	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
+
+	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
+					   "AudioVideo;FileTools;Graphics;Network;"
+}
+
+pkg_postinst() {
+	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
+	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
+	optfeature "memory compression in the client" "dev-python/lz4"
+	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
+}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2021-10-29 19:17 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2021-10-29 19:17 UTC (permalink / raw
  To: gentoo-commits

commit:     9954dbb5972a1f6d07004609a288accacf35ce1f
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Fri Oct 29 08:55:58 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 29 19:17:12 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9954dbb5

media-gfx/hydrus: Add 459.3

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://github.com/gentoo/gentoo/pull/22751
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/Manifest            |   1 +
 media-gfx/hydrus/hydrus-459.3.ebuild | 139 +++++++++++++++++++++++++++++++++++
 2 files changed, 140 insertions(+)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 6d69bc0fabf..33d5f19da2a 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,3 +1,4 @@
 DIST hydrus-456.tar.gz 38899003 BLAKE2B 03e575034f2b4234c7f9ed3d4da59a3f94e9e2871440548b192b0898fa7e5d73bf7ab07f91a380db6e884449d6d86df9aed313238f28e1b3c4d7ae4a8f7f00f4 SHA512 de16874aa714a7e3640a9673a1445049256a2a05122f57a8646fd375a295f229c8b262e8c7862bbc7257d8db84a9e4ddf03cf841af307bed30e174e8f159508a
 DIST hydrus-457.tar.gz 38915780 BLAKE2B 56506ba2098198f42593a061a79f7f6521597f057d87c07eb66b3a213111a46caaf1e167e9f49deaf3d3ffe6259105b6d19cca8fb8fbd0d1c708d796eea63394 SHA512 2a653f69928f4b65cdde332e7be52861527237a284a61ddd0536b6e1db40f91424e78953910dacf494d947a57086cbfbf9588fe638143f386910fb1d7ba1e484
 DIST hydrus-458.tar.gz 38922758 BLAKE2B 3339e44498a606664cd54357cf285f96eb4f146673d9991b9b0fb82bc961b31f4f47c9f27616251b610c4e28664a6b4753aa99713e50d93e79121270796b1408 SHA512 0f2c419012c683c163fd180662eb9d2eb5610a6d87c0cbd42be91dbdf6101e747ba0c6238d1574084a30d1da1c7546a79b0e648fe55420c510d47ab26fad28c3
+DIST hydrus-459.3.tar.gz 38933609 BLAKE2B feb1888d63dc8b6df7f070115c541c2863442ba46d8cd47648ecb35c49cf8181879760197b200f2b968eca5d51a40522d7fdb8434c19b7c6e37d0ae08b0dce74 SHA512 45bcb9b6ad7ae529b980b6759ececaf4175750e775b9f01bae754eb25321d46e0dc4d7fd2723cd43a53aff2d37433a5fdde691f6f7c6e46fb35c8dd216f88157

diff --git a/media-gfx/hydrus/hydrus-459.3.ebuild b/media-gfx/hydrus/hydrus-459.3.ebuild
new file mode 100644
index 00000000000..af8a34decb6
--- /dev/null
+++ b/media-gfx/hydrus/hydrus-459.3.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="sqlite"
+
+inherit python-single-r1 desktop optfeature
+
+DESCRIPTION="A booru-like media organizer for the desktop"
+HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
+else
+	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+# hydrus itself is WTFPL
+# icons included are CC-BY-2.5
+LICENSE="WTFPL-2 CC-BY-2.5"
+SLOT="0"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+# RDEPEND is sorted as such:
+# - No specific requirements
+# - Specific version or slot
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cloudscraper[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
+		dev-python/python-mpv[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		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}]
+	')
+"
+BDEPEND="
+	${RDEPEND}
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/httmock[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/nose[${PYTHON_USEDEP}]
+		)
+	')
+"
+
+PATCHES=(
+	"${FILESDIR}/userpath-in-local-share.patch"
+)
+
+src_prepare() {
+	default
+
+	# Contains pre-built binaries for other systems and a broken swf renderer for linux
+	rm -r bin/ || die
+	# Build files used for CI, not actually needed
+	rm -r static/build_files || die
+	# Duplicate license file, not needed
+	rm license.txt || die
+	# Python requirements files, not needed
+	rm requirements_*.txt || die
+}
+
+src_compile() {
+	python_optimize "${S}"
+}
+
+src_test() {
+	# The tests use unittest, but are run with a custom runner script.
+	# QT_QPA_PLATFORM is required to make them run without X
+	local -x QT_QPA_PLATFORM=offscreen
+	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
+}
+
+src_install() {
+	local doc="${EPREFIX}/usr/share/doc/${PF}"
+	elog "Hydrus includes an excellent manual, that can either be viewed at"
+	elog "${doc}/html/help/index.html"
+	elog "or accessed through the hydrus help menu."
+
+	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
+
+	local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/)
+	local HTML_DOCS=("${S}"/help/)
+	einstalldocs
+
+	# Files only needed for testing
+	rm test.py hydrus/hydrus_test.py || die
+	rm -r hydrus/test/ static/testing/ || die
+
+	# These files are copied into doc
+	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
+	# The program expects to find documentation here, so add a symlink to doc
+	dosym "${doc}/html/help" /opt/hydrus/help
+
+	insinto /opt/hydrus
+	doins -r "${S}"/.
+
+	exeinto /usr/bin
+	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
+	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
+
+	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
+					   "AudioVideo;FileTools;Graphics;Network;"
+}
+
+pkg_postinst() {
+	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
+	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
+	optfeature "memory compression in the client" "dev-python/lz4"
+	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
+}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2021-10-29 19:17 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2021-10-29 19:17 UTC (permalink / raw
  To: gentoo-commits

commit:     d56c5ae91c420e139885a350b28928162329c9b0
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Fri Oct 29 08:55:39 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 29 19:17:12 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d56c5ae9

media-gfx/hydrus: Drop 454

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/Manifest          |   1 -
 media-gfx/hydrus/hydrus-454.ebuild | 139 -------------------------------------
 2 files changed, 140 deletions(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 5329bab5b60..6d69bc0fabf 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,4 +1,3 @@
-DIST hydrus-454.tar.gz 38886940 BLAKE2B 38fe5b3483c13dfbf82e636be1e743bb6af6f340a86d5ea69f0e71f7452cd3506b076cf4d6f460e0a1896f0839be7494028a0cbb5f567001af025cd436cf5c45 SHA512 87971c45bc11e7eaba2e08255ca23600406124bd73d6d8d4800ec67135a0d74b5ca7fc8a8a159dbdc89f70702760469c8d719de11f5bf943f7679978a790c456
 DIST hydrus-456.tar.gz 38899003 BLAKE2B 03e575034f2b4234c7f9ed3d4da59a3f94e9e2871440548b192b0898fa7e5d73bf7ab07f91a380db6e884449d6d86df9aed313238f28e1b3c4d7ae4a8f7f00f4 SHA512 de16874aa714a7e3640a9673a1445049256a2a05122f57a8646fd375a295f229c8b262e8c7862bbc7257d8db84a9e4ddf03cf841af307bed30e174e8f159508a
 DIST hydrus-457.tar.gz 38915780 BLAKE2B 56506ba2098198f42593a061a79f7f6521597f057d87c07eb66b3a213111a46caaf1e167e9f49deaf3d3ffe6259105b6d19cca8fb8fbd0d1c708d796eea63394 SHA512 2a653f69928f4b65cdde332e7be52861527237a284a61ddd0536b6e1db40f91424e78953910dacf494d947a57086cbfbf9588fe638143f386910fb1d7ba1e484
 DIST hydrus-458.tar.gz 38922758 BLAKE2B 3339e44498a606664cd54357cf285f96eb4f146673d9991b9b0fb82bc961b31f4f47c9f27616251b610c4e28664a6b4753aa99713e50d93e79121270796b1408 SHA512 0f2c419012c683c163fd180662eb9d2eb5610a6d87c0cbd42be91dbdf6101e747ba0c6238d1574084a30d1da1c7546a79b0e648fe55420c510d47ab26fad28c3

diff --git a/media-gfx/hydrus/hydrus-454.ebuild b/media-gfx/hydrus/hydrus-454.ebuild
deleted file mode 100644
index af8a34decb6..00000000000
--- a/media-gfx/hydrus/hydrus-454.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="sqlite"
-
-inherit python-single-r1 desktop optfeature
-
-DESCRIPTION="A booru-like media organizer for the desktop"
-HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
-else
-	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-	KEYWORDS="~amd64"
-fi
-
-# hydrus itself is WTFPL
-# icons included are CC-BY-2.5
-LICENSE="WTFPL-2 CC-BY-2.5"
-SLOT="0"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-# RDEPEND is sorted as such:
-# - No specific requirements
-# - Specific version or slot
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cloudscraper[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
-		dev-python/python-mpv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		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}]
-	')
-"
-BDEPEND="
-	${RDEPEND}
-	$(python_gen_cond_dep '
-		test? (
-			dev-python/httmock[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/nose[${PYTHON_USEDEP}]
-		)
-	')
-"
-
-PATCHES=(
-	"${FILESDIR}/userpath-in-local-share.patch"
-)
-
-src_prepare() {
-	default
-
-	# Contains pre-built binaries for other systems and a broken swf renderer for linux
-	rm -r bin/ || die
-	# Build files used for CI, not actually needed
-	rm -r static/build_files || die
-	# Duplicate license file, not needed
-	rm license.txt || die
-	# Python requirements files, not needed
-	rm requirements_*.txt || die
-}
-
-src_compile() {
-	python_optimize "${S}"
-}
-
-src_test() {
-	# The tests use unittest, but are run with a custom runner script.
-	# QT_QPA_PLATFORM is required to make them run without X
-	local -x QT_QPA_PLATFORM=offscreen
-	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
-}
-
-src_install() {
-	local doc="${EPREFIX}/usr/share/doc/${PF}"
-	elog "Hydrus includes an excellent manual, that can either be viewed at"
-	elog "${doc}/html/help/index.html"
-	elog "or accessed through the hydrus help menu."
-
-	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
-
-	local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/)
-	local HTML_DOCS=("${S}"/help/)
-	einstalldocs
-
-	# Files only needed for testing
-	rm test.py hydrus/hydrus_test.py || die
-	rm -r hydrus/test/ static/testing/ || die
-
-	# These files are copied into doc
-	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
-	# The program expects to find documentation here, so add a symlink to doc
-	dosym "${doc}/html/help" /opt/hydrus/help
-
-	insinto /opt/hydrus
-	doins -r "${S}"/.
-
-	exeinto /usr/bin
-	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
-	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
-
-	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
-					   "AudioVideo;FileTools;Graphics;Network;"
-}
-
-pkg_postinst() {
-	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
-	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
-	optfeature "memory compression in the client" "dev-python/lz4"
-	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
-}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2021-11-12  1:36 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2021-11-12  1:36 UTC (permalink / raw
  To: gentoo-commits

commit:     ea8dd0807994cb66d15db0cb260af90bfb4e607a
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Mon Nov  8 08:01:29 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 12 01:36:10 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea8dd080

media-gfx/hydrus: Drop 456

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/Manifest          |   1 -
 media-gfx/hydrus/hydrus-456.ebuild | 139 -------------------------------------
 2 files changed, 140 deletions(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 33d5f19da2a..59f3683dafe 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,4 +1,3 @@
-DIST hydrus-456.tar.gz 38899003 BLAKE2B 03e575034f2b4234c7f9ed3d4da59a3f94e9e2871440548b192b0898fa7e5d73bf7ab07f91a380db6e884449d6d86df9aed313238f28e1b3c4d7ae4a8f7f00f4 SHA512 de16874aa714a7e3640a9673a1445049256a2a05122f57a8646fd375a295f229c8b262e8c7862bbc7257d8db84a9e4ddf03cf841af307bed30e174e8f159508a
 DIST hydrus-457.tar.gz 38915780 BLAKE2B 56506ba2098198f42593a061a79f7f6521597f057d87c07eb66b3a213111a46caaf1e167e9f49deaf3d3ffe6259105b6d19cca8fb8fbd0d1c708d796eea63394 SHA512 2a653f69928f4b65cdde332e7be52861527237a284a61ddd0536b6e1db40f91424e78953910dacf494d947a57086cbfbf9588fe638143f386910fb1d7ba1e484
 DIST hydrus-458.tar.gz 38922758 BLAKE2B 3339e44498a606664cd54357cf285f96eb4f146673d9991b9b0fb82bc961b31f4f47c9f27616251b610c4e28664a6b4753aa99713e50d93e79121270796b1408 SHA512 0f2c419012c683c163fd180662eb9d2eb5610a6d87c0cbd42be91dbdf6101e747ba0c6238d1574084a30d1da1c7546a79b0e648fe55420c510d47ab26fad28c3
 DIST hydrus-459.3.tar.gz 38933609 BLAKE2B feb1888d63dc8b6df7f070115c541c2863442ba46d8cd47648ecb35c49cf8181879760197b200f2b968eca5d51a40522d7fdb8434c19b7c6e37d0ae08b0dce74 SHA512 45bcb9b6ad7ae529b980b6759ececaf4175750e775b9f01bae754eb25321d46e0dc4d7fd2723cd43a53aff2d37433a5fdde691f6f7c6e46fb35c8dd216f88157

diff --git a/media-gfx/hydrus/hydrus-456.ebuild b/media-gfx/hydrus/hydrus-456.ebuild
deleted file mode 100644
index 0915a2ae543..00000000000
--- a/media-gfx/hydrus/hydrus-456.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="sqlite"
-
-inherit python-single-r1 desktop optfeature
-
-DESCRIPTION="A booru-like media organizer for the desktop"
-HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
-else
-	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-	KEYWORDS="~amd64"
-fi
-
-# hydrus itself is WTFPL
-# icons included are CC-BY-2.5
-LICENSE="WTFPL-2 CC-BY-2.5"
-SLOT="0"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-# RDEPEND is sorted as such:
-# - No specific requirements
-# - Specific version or slot
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cloudscraper[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
-		dev-python/python-mpv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		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}]
-	')
-"
-BDEPEND="
-	${RDEPEND}
-	$(python_gen_cond_dep '
-		test? (
-			dev-python/httmock[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/nose[${PYTHON_USEDEP}]
-		)
-	')
-"
-
-PATCHES=(
-	"${FILESDIR}/userpath-in-local-share.patch"
-)
-
-src_prepare() {
-	default
-
-	# Contains pre-built binaries for other systems and a broken swf renderer for linux
-	rm -r bin/ || die
-	# Build files used for CI, not actually needed
-	rm -r static/build_files || die
-	# Duplicate license file, not needed
-	rm license.txt || die
-	# Python requirements files, not needed
-	rm requirements_*.txt || die
-}
-
-src_compile() {
-	python_optimize "${S}"
-}
-
-src_test() {
-	# The tests use unittest, but are run with a custom runner script.
-	# QT_QPA_PLATFORM is required to make them run without X
-	local -x QT_QPA_PLATFORM=offscreen
-	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
-}
-
-src_install() {
-	local doc="${EPREFIX}/usr/share/doc/${PF}"
-	elog "Hydrus includes an excellent manual, that can either be viewed at"
-	elog "${doc}/html/help/index.html"
-	elog "or accessed through the hydrus help menu."
-
-	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
-
-	local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/)
-	local HTML_DOCS=("${S}"/help/)
-	einstalldocs
-
-	# Files only needed for testing
-	rm test.py hydrus/hydrus_test.py || die
-	rm -r hydrus/test/ static/testing/ || die
-
-	# These files are copied into doc
-	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
-	# The program expects to find documentation here, so add a symlink to doc
-	dosym "${doc}/html/help" /opt/hydrus/help
-
-	insinto /opt/hydrus
-	doins -r "${S}"/.
-
-	exeinto /usr/bin
-	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
-	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
-
-	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
-					   "AudioVideo;FileTools;Graphics;Network;"
-}
-
-pkg_postinst() {
-	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
-	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
-	optfeature "memory compression in the client" "dev-python/lz4"
-	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
-}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2021-11-12  1:36 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2021-11-12  1:36 UTC (permalink / raw
  To: gentoo-commits

commit:     fb44a7dbb7a8e3f77ffdc629b97295fe7c370397
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Mon Nov  8 08:01:51 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 12 01:36:11 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb44a7db

media-gfx/hydrus: Add 460

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://github.com/gentoo/gentoo/pull/22863
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/Manifest          |   1 +
 media-gfx/hydrus/hydrus-460.ebuild | 139 +++++++++++++++++++++++++++++++++++++
 2 files changed, 140 insertions(+)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 59f3683dafe..32a5ab5bd01 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,3 +1,4 @@
 DIST hydrus-457.tar.gz 38915780 BLAKE2B 56506ba2098198f42593a061a79f7f6521597f057d87c07eb66b3a213111a46caaf1e167e9f49deaf3d3ffe6259105b6d19cca8fb8fbd0d1c708d796eea63394 SHA512 2a653f69928f4b65cdde332e7be52861527237a284a61ddd0536b6e1db40f91424e78953910dacf494d947a57086cbfbf9588fe638143f386910fb1d7ba1e484
 DIST hydrus-458.tar.gz 38922758 BLAKE2B 3339e44498a606664cd54357cf285f96eb4f146673d9991b9b0fb82bc961b31f4f47c9f27616251b610c4e28664a6b4753aa99713e50d93e79121270796b1408 SHA512 0f2c419012c683c163fd180662eb9d2eb5610a6d87c0cbd42be91dbdf6101e747ba0c6238d1574084a30d1da1c7546a79b0e648fe55420c510d47ab26fad28c3
 DIST hydrus-459.3.tar.gz 38933609 BLAKE2B feb1888d63dc8b6df7f070115c541c2863442ba46d8cd47648ecb35c49cf8181879760197b200f2b968eca5d51a40522d7fdb8434c19b7c6e37d0ae08b0dce74 SHA512 45bcb9b6ad7ae529b980b6759ececaf4175750e775b9f01bae754eb25321d46e0dc4d7fd2723cd43a53aff2d37433a5fdde691f6f7c6e46fb35c8dd216f88157
+DIST hydrus-460.tar.gz 38935581 BLAKE2B f4b159f3f45e5f13867cdf163605389722d35616d5235bb64593125b83c7d9177ac590febce4beeb266be1524e106fd41c6badbc11775c6f8921c7647672ea34 SHA512 e01cc54f6906cded7760107d7874ca35f6336b9b3b673f59b5c75facbe63a7374780a92b09e51cf99052bf6149dd4df4cb9b84b768f4dd30411229e585e7a23d

diff --git a/media-gfx/hydrus/hydrus-460.ebuild b/media-gfx/hydrus/hydrus-460.ebuild
new file mode 100644
index 00000000000..0915a2ae543
--- /dev/null
+++ b/media-gfx/hydrus/hydrus-460.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="sqlite"
+
+inherit python-single-r1 desktop optfeature
+
+DESCRIPTION="A booru-like media organizer for the desktop"
+HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
+else
+	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+# hydrus itself is WTFPL
+# icons included are CC-BY-2.5
+LICENSE="WTFPL-2 CC-BY-2.5"
+SLOT="0"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+# RDEPEND is sorted as such:
+# - No specific requirements
+# - Specific version or slot
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cloudscraper[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
+		dev-python/python-mpv[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		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}]
+	')
+"
+BDEPEND="
+	${RDEPEND}
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/httmock[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/nose[${PYTHON_USEDEP}]
+		)
+	')
+"
+
+PATCHES=(
+	"${FILESDIR}/userpath-in-local-share.patch"
+)
+
+src_prepare() {
+	default
+
+	# Contains pre-built binaries for other systems and a broken swf renderer for linux
+	rm -r bin/ || die
+	# Build files used for CI, not actually needed
+	rm -r static/build_files || die
+	# Duplicate license file, not needed
+	rm license.txt || die
+	# Python requirements files, not needed
+	rm requirements_*.txt || die
+}
+
+src_compile() {
+	python_optimize "${S}"
+}
+
+src_test() {
+	# The tests use unittest, but are run with a custom runner script.
+	# QT_QPA_PLATFORM is required to make them run without X
+	local -x QT_QPA_PLATFORM=offscreen
+	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
+}
+
+src_install() {
+	local doc="${EPREFIX}/usr/share/doc/${PF}"
+	elog "Hydrus includes an excellent manual, that can either be viewed at"
+	elog "${doc}/html/help/index.html"
+	elog "or accessed through the hydrus help menu."
+
+	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
+
+	local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/)
+	local HTML_DOCS=("${S}"/help/)
+	einstalldocs
+
+	# Files only needed for testing
+	rm test.py hydrus/hydrus_test.py || die
+	rm -r hydrus/test/ static/testing/ || die
+
+	# These files are copied into doc
+	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
+	# The program expects to find documentation here, so add a symlink to doc
+	dosym "${doc}/html/help" /opt/hydrus/help
+
+	insinto /opt/hydrus
+	doins -r "${S}"/.
+
+	exeinto /usr/bin
+	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
+	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
+
+	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
+					   "AudioVideo;FileTools;Graphics;Network;"
+}
+
+pkg_postinst() {
+	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
+	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
+	optfeature "memory compression in the client" "dev-python/lz4"
+	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
+}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2021-11-22 10:11 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2021-11-22 10:11 UTC (permalink / raw
  To: gentoo-commits

commit:     e1e057aeddf5b7f01dadde074fb2fe41a9df04b4
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Fri Nov 12 16:15:53 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Nov 22 10:04:12 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1e057ae

media-gfx/hydrus: Add 461, drop 457

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/Manifest                                 | 2 +-
 media-gfx/hydrus/{hydrus-457.ebuild => hydrus-461.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 32a5ab5bd010..fa6cca1af73b 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,4 +1,4 @@
-DIST hydrus-457.tar.gz 38915780 BLAKE2B 56506ba2098198f42593a061a79f7f6521597f057d87c07eb66b3a213111a46caaf1e167e9f49deaf3d3ffe6259105b6d19cca8fb8fbd0d1c708d796eea63394 SHA512 2a653f69928f4b65cdde332e7be52861527237a284a61ddd0536b6e1db40f91424e78953910dacf494d947a57086cbfbf9588fe638143f386910fb1d7ba1e484
 DIST hydrus-458.tar.gz 38922758 BLAKE2B 3339e44498a606664cd54357cf285f96eb4f146673d9991b9b0fb82bc961b31f4f47c9f27616251b610c4e28664a6b4753aa99713e50d93e79121270796b1408 SHA512 0f2c419012c683c163fd180662eb9d2eb5610a6d87c0cbd42be91dbdf6101e747ba0c6238d1574084a30d1da1c7546a79b0e648fe55420c510d47ab26fad28c3
 DIST hydrus-459.3.tar.gz 38933609 BLAKE2B feb1888d63dc8b6df7f070115c541c2863442ba46d8cd47648ecb35c49cf8181879760197b200f2b968eca5d51a40522d7fdb8434c19b7c6e37d0ae08b0dce74 SHA512 45bcb9b6ad7ae529b980b6759ececaf4175750e775b9f01bae754eb25321d46e0dc4d7fd2723cd43a53aff2d37433a5fdde691f6f7c6e46fb35c8dd216f88157
 DIST hydrus-460.tar.gz 38935581 BLAKE2B f4b159f3f45e5f13867cdf163605389722d35616d5235bb64593125b83c7d9177ac590febce4beeb266be1524e106fd41c6badbc11775c6f8921c7647672ea34 SHA512 e01cc54f6906cded7760107d7874ca35f6336b9b3b673f59b5c75facbe63a7374780a92b09e51cf99052bf6149dd4df4cb9b84b768f4dd30411229e585e7a23d
+DIST hydrus-461.tar.gz 38945276 BLAKE2B 28ffb1ae5de7439cad8dad9dc432fb585e98c23a19a8a47c6f6f26cb53007d81ca07fa5b615546247ff1768f315fe0f5baf81753b71e2c7f593fb7b83d230a43 SHA512 1f9c893cd904ccf288d494fa0a4bd4a125af28cb16d072b4a97e4d1bd1439c83d4ed6e49f374869f34beb23b36613c2173077bfffaaaf0e37c8e1dc6875698cd

diff --git a/media-gfx/hydrus/hydrus-457.ebuild b/media-gfx/hydrus/hydrus-461.ebuild
similarity index 100%
rename from media-gfx/hydrus/hydrus-457.ebuild
rename to media-gfx/hydrus/hydrus-461.ebuild


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2021-11-22 10:11 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2021-11-22 10:11 UTC (permalink / raw
  To: gentoo-commits

commit:     0915834fa3f29220cfda76f5359507c7e1fb4621
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Sat Nov 20 13:31:00 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Nov 22 10:04:13 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0915834f

media-gfx/hydrus: Add 462, drop 458

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://github.com/gentoo/gentoo/pull/22920
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/Manifest                                 | 2 +-
 media-gfx/hydrus/{hydrus-458.ebuild => hydrus-462.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index fa6cca1af73b..897d7121c8dc 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,4 +1,4 @@
-DIST hydrus-458.tar.gz 38922758 BLAKE2B 3339e44498a606664cd54357cf285f96eb4f146673d9991b9b0fb82bc961b31f4f47c9f27616251b610c4e28664a6b4753aa99713e50d93e79121270796b1408 SHA512 0f2c419012c683c163fd180662eb9d2eb5610a6d87c0cbd42be91dbdf6101e747ba0c6238d1574084a30d1da1c7546a79b0e648fe55420c510d47ab26fad28c3
 DIST hydrus-459.3.tar.gz 38933609 BLAKE2B feb1888d63dc8b6df7f070115c541c2863442ba46d8cd47648ecb35c49cf8181879760197b200f2b968eca5d51a40522d7fdb8434c19b7c6e37d0ae08b0dce74 SHA512 45bcb9b6ad7ae529b980b6759ececaf4175750e775b9f01bae754eb25321d46e0dc4d7fd2723cd43a53aff2d37433a5fdde691f6f7c6e46fb35c8dd216f88157
 DIST hydrus-460.tar.gz 38935581 BLAKE2B f4b159f3f45e5f13867cdf163605389722d35616d5235bb64593125b83c7d9177ac590febce4beeb266be1524e106fd41c6badbc11775c6f8921c7647672ea34 SHA512 e01cc54f6906cded7760107d7874ca35f6336b9b3b673f59b5c75facbe63a7374780a92b09e51cf99052bf6149dd4df4cb9b84b768f4dd30411229e585e7a23d
 DIST hydrus-461.tar.gz 38945276 BLAKE2B 28ffb1ae5de7439cad8dad9dc432fb585e98c23a19a8a47c6f6f26cb53007d81ca07fa5b615546247ff1768f315fe0f5baf81753b71e2c7f593fb7b83d230a43 SHA512 1f9c893cd904ccf288d494fa0a4bd4a125af28cb16d072b4a97e4d1bd1439c83d4ed6e49f374869f34beb23b36613c2173077bfffaaaf0e37c8e1dc6875698cd
+DIST hydrus-462.tar.gz 39424447 BLAKE2B 4b7c84c4a8af8d263ebc597b54a535b66598f11d0df31b6e70597f6127dfaf8c7bfd980c1d706d82eadd29c502abb3b95793d3110d588e966ade8d0b73f02d62 SHA512 ff3c8cd94355670e7a6b2712e2c384ff09733b476d9097883f40e9dea8acc2a26b01d944743b7e19e557f20cf9b22e6125813329dae9239783bee18447de3560

diff --git a/media-gfx/hydrus/hydrus-458.ebuild b/media-gfx/hydrus/hydrus-462.ebuild
similarity index 100%
rename from media-gfx/hydrus/hydrus-458.ebuild
rename to media-gfx/hydrus/hydrus-462.ebuild


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2021-12-01 21:30 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2021-12-01 21:30 UTC (permalink / raw
  To: gentoo-commits

commit:     fecde1e78264badf8a6a50f0b7fcc912e9e23cde
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Mon Nov 29 16:38:29 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec  1 21:30:20 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fecde1e7

media-gfx/hydrus: Add 463, remove 459.3

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://github.com/gentoo/gentoo/pull/23116
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/Manifest                                   | 2 +-
 media-gfx/hydrus/{hydrus-459.3.ebuild => hydrus-463.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 897d7121c8dc..48ba47686e85 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,4 +1,4 @@
-DIST hydrus-459.3.tar.gz 38933609 BLAKE2B feb1888d63dc8b6df7f070115c541c2863442ba46d8cd47648ecb35c49cf8181879760197b200f2b968eca5d51a40522d7fdb8434c19b7c6e37d0ae08b0dce74 SHA512 45bcb9b6ad7ae529b980b6759ececaf4175750e775b9f01bae754eb25321d46e0dc4d7fd2723cd43a53aff2d37433a5fdde691f6f7c6e46fb35c8dd216f88157
 DIST hydrus-460.tar.gz 38935581 BLAKE2B f4b159f3f45e5f13867cdf163605389722d35616d5235bb64593125b83c7d9177ac590febce4beeb266be1524e106fd41c6badbc11775c6f8921c7647672ea34 SHA512 e01cc54f6906cded7760107d7874ca35f6336b9b3b673f59b5c75facbe63a7374780a92b09e51cf99052bf6149dd4df4cb9b84b768f4dd30411229e585e7a23d
 DIST hydrus-461.tar.gz 38945276 BLAKE2B 28ffb1ae5de7439cad8dad9dc432fb585e98c23a19a8a47c6f6f26cb53007d81ca07fa5b615546247ff1768f315fe0f5baf81753b71e2c7f593fb7b83d230a43 SHA512 1f9c893cd904ccf288d494fa0a4bd4a125af28cb16d072b4a97e4d1bd1439c83d4ed6e49f374869f34beb23b36613c2173077bfffaaaf0e37c8e1dc6875698cd
 DIST hydrus-462.tar.gz 39424447 BLAKE2B 4b7c84c4a8af8d263ebc597b54a535b66598f11d0df31b6e70597f6127dfaf8c7bfd980c1d706d82eadd29c502abb3b95793d3110d588e966ade8d0b73f02d62 SHA512 ff3c8cd94355670e7a6b2712e2c384ff09733b476d9097883f40e9dea8acc2a26b01d944743b7e19e557f20cf9b22e6125813329dae9239783bee18447de3560
+DIST hydrus-463.tar.gz 39435289 BLAKE2B d6e2f97f12b8141019012a0c86e3f99f2c1041cb70aff1e8c4aab3d1a6594d68f415afd8059a91407d151d72820b71dbb10516f5b717b0f7665563c1cd4f302c SHA512 3dcf2fb0107459171ce227edb1031c8478e20919e163d1c5779d524e3fcd66a038d4c278c29fc98ce34884e75a1ee50a22c0211f272afb1a4d1e7a977890202b

diff --git a/media-gfx/hydrus/hydrus-459.3.ebuild b/media-gfx/hydrus/hydrus-463.ebuild
similarity index 100%
rename from media-gfx/hydrus/hydrus-459.3.ebuild
rename to media-gfx/hydrus/hydrus-463.ebuild


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2021-12-24  4:47 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2021-12-24  4:47 UTC (permalink / raw
  To: gentoo-commits

commit:     d59989110be033927d8442c7c8349a3603d8f96e
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Thu Dec 16 16:50:11 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 24 04:46:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5998911

media-gfx/hydrus: Add 466, remove 460

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://github.com/gentoo/gentoo/pull/23327
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/Manifest                                 | 2 +-
 media-gfx/hydrus/{hydrus-460.ebuild => hydrus-466.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 48ba47686e85..67dfc116214c 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,4 +1,4 @@
-DIST hydrus-460.tar.gz 38935581 BLAKE2B f4b159f3f45e5f13867cdf163605389722d35616d5235bb64593125b83c7d9177ac590febce4beeb266be1524e106fd41c6badbc11775c6f8921c7647672ea34 SHA512 e01cc54f6906cded7760107d7874ca35f6336b9b3b673f59b5c75facbe63a7374780a92b09e51cf99052bf6149dd4df4cb9b84b768f4dd30411229e585e7a23d
 DIST hydrus-461.tar.gz 38945276 BLAKE2B 28ffb1ae5de7439cad8dad9dc432fb585e98c23a19a8a47c6f6f26cb53007d81ca07fa5b615546247ff1768f315fe0f5baf81753b71e2c7f593fb7b83d230a43 SHA512 1f9c893cd904ccf288d494fa0a4bd4a125af28cb16d072b4a97e4d1bd1439c83d4ed6e49f374869f34beb23b36613c2173077bfffaaaf0e37c8e1dc6875698cd
 DIST hydrus-462.tar.gz 39424447 BLAKE2B 4b7c84c4a8af8d263ebc597b54a535b66598f11d0df31b6e70597f6127dfaf8c7bfd980c1d706d82eadd29c502abb3b95793d3110d588e966ade8d0b73f02d62 SHA512 ff3c8cd94355670e7a6b2712e2c384ff09733b476d9097883f40e9dea8acc2a26b01d944743b7e19e557f20cf9b22e6125813329dae9239783bee18447de3560
 DIST hydrus-463.tar.gz 39435289 BLAKE2B d6e2f97f12b8141019012a0c86e3f99f2c1041cb70aff1e8c4aab3d1a6594d68f415afd8059a91407d151d72820b71dbb10516f5b717b0f7665563c1cd4f302c SHA512 3dcf2fb0107459171ce227edb1031c8478e20919e163d1c5779d524e3fcd66a038d4c278c29fc98ce34884e75a1ee50a22c0211f272afb1a4d1e7a977890202b
+DIST hydrus-466.tar.gz 39454888 BLAKE2B 12663c3781e71def858a262013018ce5ae29ce007a6755ae05abb8f44aa6c70a8b2f9c358dd8324f8148fa86d9d801121c1a6373d6faae1f9fec2bbf98aa0e7f SHA512 4e796a85f65d24f60e7a2e743b7924bb4ce40ab2f23b7816d0953dc696969d1c6690ae2384d71df5edfb6d9dc9fa548c41174c611c98c8ceb8a28c0453235d4c

diff --git a/media-gfx/hydrus/hydrus-460.ebuild b/media-gfx/hydrus/hydrus-466.ebuild
similarity index 100%
rename from media-gfx/hydrus/hydrus-460.ebuild
rename to media-gfx/hydrus/hydrus-466.ebuild


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2021-12-24  8:13 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2021-12-24  8:13 UTC (permalink / raw
  To: gentoo-commits

commit:     c03a418e1edb19fcf952ee311374879768606f96
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Fri Dec 24 07:59:54 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 24 08:13:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c03a418e

media-gfx/hydrus: Add the lcms use flag to pillow

Closes: https://bugs.gentoo.org/829900

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/{hydrus-466.ebuild => hydrus-466-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/hydrus/hydrus-466.ebuild b/media-gfx/hydrus/hydrus-466-r1.ebuild
similarity index 98%
rename from media-gfx/hydrus/hydrus-466.ebuild
rename to media-gfx/hydrus/hydrus-466-r1.ebuild
index 0915a2ae5436..aa080605c68f 100644
--- a/media-gfx/hydrus/hydrus-466.ebuild
+++ b/media-gfx/hydrus/hydrus-466-r1.ebuild
@@ -41,7 +41,7 @@ RDEPEND="
 		dev-python/html5lib[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},lcms]
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
 		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2021-12-24  8:13 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2021-12-24  8:13 UTC (permalink / raw
  To: gentoo-commits

commit:     2e13a10c870dcf85df232c1345c8ef3f0c6230fa
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Fri Dec 24 08:07:44 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 24 08:13:35 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e13a10c

media-gfx/hydrus: Drop 461, Add 467

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://github.com/gentoo/gentoo/pull/23493
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/Manifest                                 | 2 +-
 media-gfx/hydrus/{hydrus-461.ebuild => hydrus-467.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 67dfc116214c..ff16c0377535 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,4 +1,4 @@
-DIST hydrus-461.tar.gz 38945276 BLAKE2B 28ffb1ae5de7439cad8dad9dc432fb585e98c23a19a8a47c6f6f26cb53007d81ca07fa5b615546247ff1768f315fe0f5baf81753b71e2c7f593fb7b83d230a43 SHA512 1f9c893cd904ccf288d494fa0a4bd4a125af28cb16d072b4a97e4d1bd1439c83d4ed6e49f374869f34beb23b36613c2173077bfffaaaf0e37c8e1dc6875698cd
 DIST hydrus-462.tar.gz 39424447 BLAKE2B 4b7c84c4a8af8d263ebc597b54a535b66598f11d0df31b6e70597f6127dfaf8c7bfd980c1d706d82eadd29c502abb3b95793d3110d588e966ade8d0b73f02d62 SHA512 ff3c8cd94355670e7a6b2712e2c384ff09733b476d9097883f40e9dea8acc2a26b01d944743b7e19e557f20cf9b22e6125813329dae9239783bee18447de3560
 DIST hydrus-463.tar.gz 39435289 BLAKE2B d6e2f97f12b8141019012a0c86e3f99f2c1041cb70aff1e8c4aab3d1a6594d68f415afd8059a91407d151d72820b71dbb10516f5b717b0f7665563c1cd4f302c SHA512 3dcf2fb0107459171ce227edb1031c8478e20919e163d1c5779d524e3fcd66a038d4c278c29fc98ce34884e75a1ee50a22c0211f272afb1a4d1e7a977890202b
 DIST hydrus-466.tar.gz 39454888 BLAKE2B 12663c3781e71def858a262013018ce5ae29ce007a6755ae05abb8f44aa6c70a8b2f9c358dd8324f8148fa86d9d801121c1a6373d6faae1f9fec2bbf98aa0e7f SHA512 4e796a85f65d24f60e7a2e743b7924bb4ce40ab2f23b7816d0953dc696969d1c6690ae2384d71df5edfb6d9dc9fa548c41174c611c98c8ceb8a28c0453235d4c
+DIST hydrus-467.tar.gz 39386111 BLAKE2B 75c13f5aa3cb745c01d05fddb5e443b74a4c6cb09233d128f017f7741465215e4a62b402e222e974017486e7b75e6a1fd0ec0c61b58484897f7f74e712bf0e46 SHA512 af461003f1f1cc8eb93b0efdff609d184844ddd6defcda6d4cec8c1596a496d681ae383ea0d0a3ad71d3b841c1b68ad0480a3f726ad1fafdbc042ddbbbadc639

diff --git a/media-gfx/hydrus/hydrus-461.ebuild b/media-gfx/hydrus/hydrus-467.ebuild
similarity index 98%
rename from media-gfx/hydrus/hydrus-461.ebuild
rename to media-gfx/hydrus/hydrus-467.ebuild
index 0915a2ae5436..aa080605c68f 100644
--- a/media-gfx/hydrus/hydrus-461.ebuild
+++ b/media-gfx/hydrus/hydrus-467.ebuild
@@ -41,7 +41,7 @@ RDEPEND="
 		dev-python/html5lib[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},lcms]
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
 		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2022-01-09  1:42 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2022-01-09  1:42 UTC (permalink / raw
  To: gentoo-commits

commit:     6874fa87b03b55383ebe6084e8d979a374913df0
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Sat Jan  8 20:34:32 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan  9 01:27:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6874fa87

media-gfx/hydrus: Add 468, drop 462

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://github.com/gentoo/gentoo/pull/23706
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/Manifest                                 | 2 +-
 media-gfx/hydrus/{hydrus-462.ebuild => hydrus-468.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index ff16c0377535..a49ac01a9656 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,4 +1,4 @@
-DIST hydrus-462.tar.gz 39424447 BLAKE2B 4b7c84c4a8af8d263ebc597b54a535b66598f11d0df31b6e70597f6127dfaf8c7bfd980c1d706d82eadd29c502abb3b95793d3110d588e966ade8d0b73f02d62 SHA512 ff3c8cd94355670e7a6b2712e2c384ff09733b476d9097883f40e9dea8acc2a26b01d944743b7e19e557f20cf9b22e6125813329dae9239783bee18447de3560
 DIST hydrus-463.tar.gz 39435289 BLAKE2B d6e2f97f12b8141019012a0c86e3f99f2c1041cb70aff1e8c4aab3d1a6594d68f415afd8059a91407d151d72820b71dbb10516f5b717b0f7665563c1cd4f302c SHA512 3dcf2fb0107459171ce227edb1031c8478e20919e163d1c5779d524e3fcd66a038d4c278c29fc98ce34884e75a1ee50a22c0211f272afb1a4d1e7a977890202b
 DIST hydrus-466.tar.gz 39454888 BLAKE2B 12663c3781e71def858a262013018ce5ae29ce007a6755ae05abb8f44aa6c70a8b2f9c358dd8324f8148fa86d9d801121c1a6373d6faae1f9fec2bbf98aa0e7f SHA512 4e796a85f65d24f60e7a2e743b7924bb4ce40ab2f23b7816d0953dc696969d1c6690ae2384d71df5edfb6d9dc9fa548c41174c611c98c8ceb8a28c0453235d4c
 DIST hydrus-467.tar.gz 39386111 BLAKE2B 75c13f5aa3cb745c01d05fddb5e443b74a4c6cb09233d128f017f7741465215e4a62b402e222e974017486e7b75e6a1fd0ec0c61b58484897f7f74e712bf0e46 SHA512 af461003f1f1cc8eb93b0efdff609d184844ddd6defcda6d4cec8c1596a496d681ae383ea0d0a3ad71d3b841c1b68ad0480a3f726ad1fafdbc042ddbbbadc639
+DIST hydrus-468.tar.gz 39392634 BLAKE2B a6dd22e388a0f4d5b312985ea6686ee18fb51dd149188c3877ec3a44f1a2013617770a0b1234b862e9096ca1d61925fcf8dbd2f5871e44fdd695662651f5cec1 SHA512 0c6f6730304e1f48496bad0eae1694e2d5bb674bcf049555658f55246a03a9105e4e4a12534256c1c08e8337ed9dfaf0ae8f68a40b70a7e532df0ac6365e9fb6

diff --git a/media-gfx/hydrus/hydrus-462.ebuild b/media-gfx/hydrus/hydrus-468.ebuild
similarity index 100%
rename from media-gfx/hydrus/hydrus-462.ebuild
rename to media-gfx/hydrus/hydrus-468.ebuild


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2022-01-09  1:42 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2022-01-09  1:42 UTC (permalink / raw
  To: gentoo-commits

commit:     1e206bc77f4a5cf072bbfffde9b0f93bdc717f32
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  9 01:42:42 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan  9 01:42:42 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e206bc7

media-gfx/hydrus: fix IncorrectCopyright

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/hydrus-468.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/hydrus/hydrus-468.ebuild b/media-gfx/hydrus/hydrus-468.ebuild
index 0915a2ae5436..8ce7aabfa36d 100644
--- a/media-gfx/hydrus/hydrus-468.ebuild
+++ b/media-gfx/hydrus/hydrus-468.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2022-01-17  1:57 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2022-01-17  1:57 UTC (permalink / raw
  To: gentoo-commits

commit:     22a650c0888b62d682b041421bbc5f06cf3c00c3
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Mon Jan 10 07:25:01 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 17 01:57:32 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22a650c0

media-gfx/hydrus: Fix LCMS error for 468 too, copied the wrong file

Closes: https://bugs.gentoo.org/830827
Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/{hydrus-468.ebuild => hydrus-468-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/hydrus/hydrus-468.ebuild b/media-gfx/hydrus/hydrus-468-r1.ebuild
similarity index 98%
rename from media-gfx/hydrus/hydrus-468.ebuild
rename to media-gfx/hydrus/hydrus-468-r1.ebuild
index 8ce7aabfa36d..f45dbc3ac8ef 100644
--- a/media-gfx/hydrus/hydrus-468.ebuild
+++ b/media-gfx/hydrus/hydrus-468-r1.ebuild
@@ -41,7 +41,7 @@ RDEPEND="
 		dev-python/html5lib[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},lcms]
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
 		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2022-01-17  1:57 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2022-01-17  1:57 UTC (permalink / raw
  To: gentoo-commits

commit:     773fca56d2da5f09c70ebcd61426acf43f8d2c14
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Sun Jan 16 19:07:29 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 17 01:57:33 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=773fca56

media-gfx/hydrus: Drop 463, add 469

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://github.com/gentoo/gentoo/pull/23722
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/Manifest                                 | 2 +-
 media-gfx/hydrus/{hydrus-463.ebuild => hydrus-469.ebuild} | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index a49ac01a9656..967430e33f4b 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,4 +1,4 @@
-DIST hydrus-463.tar.gz 39435289 BLAKE2B d6e2f97f12b8141019012a0c86e3f99f2c1041cb70aff1e8c4aab3d1a6594d68f415afd8059a91407d151d72820b71dbb10516f5b717b0f7665563c1cd4f302c SHA512 3dcf2fb0107459171ce227edb1031c8478e20919e163d1c5779d524e3fcd66a038d4c278c29fc98ce34884e75a1ee50a22c0211f272afb1a4d1e7a977890202b
 DIST hydrus-466.tar.gz 39454888 BLAKE2B 12663c3781e71def858a262013018ce5ae29ce007a6755ae05abb8f44aa6c70a8b2f9c358dd8324f8148fa86d9d801121c1a6373d6faae1f9fec2bbf98aa0e7f SHA512 4e796a85f65d24f60e7a2e743b7924bb4ce40ab2f23b7816d0953dc696969d1c6690ae2384d71df5edfb6d9dc9fa548c41174c611c98c8ceb8a28c0453235d4c
 DIST hydrus-467.tar.gz 39386111 BLAKE2B 75c13f5aa3cb745c01d05fddb5e443b74a4c6cb09233d128f017f7741465215e4a62b402e222e974017486e7b75e6a1fd0ec0c61b58484897f7f74e712bf0e46 SHA512 af461003f1f1cc8eb93b0efdff609d184844ddd6defcda6d4cec8c1596a496d681ae383ea0d0a3ad71d3b841c1b68ad0480a3f726ad1fafdbc042ddbbbadc639
 DIST hydrus-468.tar.gz 39392634 BLAKE2B a6dd22e388a0f4d5b312985ea6686ee18fb51dd149188c3877ec3a44f1a2013617770a0b1234b862e9096ca1d61925fcf8dbd2f5871e44fdd695662651f5cec1 SHA512 0c6f6730304e1f48496bad0eae1694e2d5bb674bcf049555658f55246a03a9105e4e4a12534256c1c08e8337ed9dfaf0ae8f68a40b70a7e532df0ac6365e9fb6
+DIST hydrus-469.tar.gz 39398328 BLAKE2B e10791db063c9cde1e204c353f27f4f1875e8a1f6981cf2d4f79fa6dbe55958be2ec310bdf77d640ff7b0cb7528870e34209cfde00035e1b29c75def524aa1e2 SHA512 b9416c195490fb7bc87fcaab58d79c1b13a63e577d0496ffae22ea901dfdd445a2b7b3197f0cc97c60339455fd2c687679f392787af5595cc167777364551485

diff --git a/media-gfx/hydrus/hydrus-463.ebuild b/media-gfx/hydrus/hydrus-469.ebuild
similarity index 97%
rename from media-gfx/hydrus/hydrus-463.ebuild
rename to media-gfx/hydrus/hydrus-469.ebuild
index af8a34decb6b..f45dbc3ac8ef 100644
--- a/media-gfx/hydrus/hydrus-463.ebuild
+++ b/media-gfx/hydrus/hydrus-469.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=8
+EAPI=7
 
 PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="sqlite"
@@ -41,7 +41,7 @@ RDEPEND="
 		dev-python/html5lib[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},lcms]
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
 		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2022-02-03  2:19 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2022-02-03  2:19 UTC (permalink / raw
  To: gentoo-commits

commit:     23198257e514f9140f37e1f0521662c8b3ff490d
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Mon Jan 31 16:37:28 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb  3 02:17:47 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23198257

media-gfx/hydrus: Drop 466, add 471, fix 9999

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://github.com/gentoo/gentoo/pull/24031
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/Manifest                                    | 2 +-
 media-gfx/hydrus/{hydrus-466-r1.ebuild => hydrus-471.ebuild} | 0
 media-gfx/hydrus/hydrus-9999.ebuild                          | 4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 967430e33f4b..3ff054ac302c 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,4 +1,4 @@
-DIST hydrus-466.tar.gz 39454888 BLAKE2B 12663c3781e71def858a262013018ce5ae29ce007a6755ae05abb8f44aa6c70a8b2f9c358dd8324f8148fa86d9d801121c1a6373d6faae1f9fec2bbf98aa0e7f SHA512 4e796a85f65d24f60e7a2e743b7924bb4ce40ab2f23b7816d0953dc696969d1c6690ae2384d71df5edfb6d9dc9fa548c41174c611c98c8ceb8a28c0453235d4c
 DIST hydrus-467.tar.gz 39386111 BLAKE2B 75c13f5aa3cb745c01d05fddb5e443b74a4c6cb09233d128f017f7741465215e4a62b402e222e974017486e7b75e6a1fd0ec0c61b58484897f7f74e712bf0e46 SHA512 af461003f1f1cc8eb93b0efdff609d184844ddd6defcda6d4cec8c1596a496d681ae383ea0d0a3ad71d3b841c1b68ad0480a3f726ad1fafdbc042ddbbbadc639
 DIST hydrus-468.tar.gz 39392634 BLAKE2B a6dd22e388a0f4d5b312985ea6686ee18fb51dd149188c3877ec3a44f1a2013617770a0b1234b862e9096ca1d61925fcf8dbd2f5871e44fdd695662651f5cec1 SHA512 0c6f6730304e1f48496bad0eae1694e2d5bb674bcf049555658f55246a03a9105e4e4a12534256c1c08e8337ed9dfaf0ae8f68a40b70a7e532df0ac6365e9fb6
 DIST hydrus-469.tar.gz 39398328 BLAKE2B e10791db063c9cde1e204c353f27f4f1875e8a1f6981cf2d4f79fa6dbe55958be2ec310bdf77d640ff7b0cb7528870e34209cfde00035e1b29c75def524aa1e2 SHA512 b9416c195490fb7bc87fcaab58d79c1b13a63e577d0496ffae22ea901dfdd445a2b7b3197f0cc97c60339455fd2c687679f392787af5595cc167777364551485
+DIST hydrus-471.tar.gz 39406654 BLAKE2B 92ebf94acabc5528848d10585b3b6a0a4f6f8365136f3f724b3a6795b03db5ad3de1abed574dce6cfb2061afaf11d34939ce11beb1de9e3472515c562a578fa5 SHA512 489384663239348dac961fb4597c87cedc1cd29143e96243b99e6e65d9083eb89f73fdabc7d3c26b396ab166494b1d93d0e18b3645cee52019db1b016a256d16

diff --git a/media-gfx/hydrus/hydrus-466-r1.ebuild b/media-gfx/hydrus/hydrus-471.ebuild
similarity index 100%
rename from media-gfx/hydrus/hydrus-466-r1.ebuild
rename to media-gfx/hydrus/hydrus-471.ebuild

diff --git a/media-gfx/hydrus/hydrus-9999.ebuild b/media-gfx/hydrus/hydrus-9999.ebuild
index 0915a2ae5436..f45dbc3ac8ef 100644
--- a/media-gfx/hydrus/hydrus-9999.ebuild
+++ b/media-gfx/hydrus/hydrus-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -41,7 +41,7 @@ RDEPEND="
 		dev-python/html5lib[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},lcms]
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
 		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2022-02-18  2:44 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2022-02-18  2:44 UTC (permalink / raw
  To: gentoo-commits

commit:     324e226b4713a35347fb75ca646f96bb0ca7cfbd
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Thu Feb  3 19:28:07 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 18 02:43:01 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=324e226b

media-gfx/hydrus: Drop 471, add 472

Closes: https://bugs.gentoo.org/832605

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/Manifest                                 | 2 +-
 media-gfx/hydrus/{hydrus-471.ebuild => hydrus-472.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 3ff054ac302c..0ef278f10e71 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,4 +1,4 @@
 DIST hydrus-467.tar.gz 39386111 BLAKE2B 75c13f5aa3cb745c01d05fddb5e443b74a4c6cb09233d128f017f7741465215e4a62b402e222e974017486e7b75e6a1fd0ec0c61b58484897f7f74e712bf0e46 SHA512 af461003f1f1cc8eb93b0efdff609d184844ddd6defcda6d4cec8c1596a496d681ae383ea0d0a3ad71d3b841c1b68ad0480a3f726ad1fafdbc042ddbbbadc639
 DIST hydrus-468.tar.gz 39392634 BLAKE2B a6dd22e388a0f4d5b312985ea6686ee18fb51dd149188c3877ec3a44f1a2013617770a0b1234b862e9096ca1d61925fcf8dbd2f5871e44fdd695662651f5cec1 SHA512 0c6f6730304e1f48496bad0eae1694e2d5bb674bcf049555658f55246a03a9105e4e4a12534256c1c08e8337ed9dfaf0ae8f68a40b70a7e532df0ac6365e9fb6
 DIST hydrus-469.tar.gz 39398328 BLAKE2B e10791db063c9cde1e204c353f27f4f1875e8a1f6981cf2d4f79fa6dbe55958be2ec310bdf77d640ff7b0cb7528870e34209cfde00035e1b29c75def524aa1e2 SHA512 b9416c195490fb7bc87fcaab58d79c1b13a63e577d0496ffae22ea901dfdd445a2b7b3197f0cc97c60339455fd2c687679f392787af5595cc167777364551485
-DIST hydrus-471.tar.gz 39406654 BLAKE2B 92ebf94acabc5528848d10585b3b6a0a4f6f8365136f3f724b3a6795b03db5ad3de1abed574dce6cfb2061afaf11d34939ce11beb1de9e3472515c562a578fa5 SHA512 489384663239348dac961fb4597c87cedc1cd29143e96243b99e6e65d9083eb89f73fdabc7d3c26b396ab166494b1d93d0e18b3645cee52019db1b016a256d16
+DIST hydrus-472.tar.gz 39421962 BLAKE2B 2e7ac5d5169aed1d9437434514d878ce175bfe13116f8972b2a21532e0058ce09d9a55744e17b71d1755ebc8436d6f2ff4995dd81c9a49844aff42e60cd2564f SHA512 5b3eecf724fd2e6dede39bbf33665607294d7f345baf052fe379a241d6ee157550ca390d32bb1b256c1fee2224190b54ba9d7d0718ec10b147580eb1f5216b34

diff --git a/media-gfx/hydrus/hydrus-471.ebuild b/media-gfx/hydrus/hydrus-472.ebuild
similarity index 100%
rename from media-gfx/hydrus/hydrus-471.ebuild
rename to media-gfx/hydrus/hydrus-472.ebuild


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2022-02-18  2:44 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2022-02-18  2:44 UTC (permalink / raw
  To: gentoo-commits

commit:     50c3b84397099f225f973c8a5305648c6cd9e525
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Sat Feb 12 11:21:19 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 18 02:43:06 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50c3b843

media-gfx/hydrus: Drop 467, add 473

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://github.com/gentoo/gentoo/pull/24070
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/Manifest                                 | 2 +-
 media-gfx/hydrus/{hydrus-467.ebuild => hydrus-473.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 0ef278f10e71..d335a49a81ab 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,4 +1,4 @@
-DIST hydrus-467.tar.gz 39386111 BLAKE2B 75c13f5aa3cb745c01d05fddb5e443b74a4c6cb09233d128f017f7741465215e4a62b402e222e974017486e7b75e6a1fd0ec0c61b58484897f7f74e712bf0e46 SHA512 af461003f1f1cc8eb93b0efdff609d184844ddd6defcda6d4cec8c1596a496d681ae383ea0d0a3ad71d3b841c1b68ad0480a3f726ad1fafdbc042ddbbbadc639
 DIST hydrus-468.tar.gz 39392634 BLAKE2B a6dd22e388a0f4d5b312985ea6686ee18fb51dd149188c3877ec3a44f1a2013617770a0b1234b862e9096ca1d61925fcf8dbd2f5871e44fdd695662651f5cec1 SHA512 0c6f6730304e1f48496bad0eae1694e2d5bb674bcf049555658f55246a03a9105e4e4a12534256c1c08e8337ed9dfaf0ae8f68a40b70a7e532df0ac6365e9fb6
 DIST hydrus-469.tar.gz 39398328 BLAKE2B e10791db063c9cde1e204c353f27f4f1875e8a1f6981cf2d4f79fa6dbe55958be2ec310bdf77d640ff7b0cb7528870e34209cfde00035e1b29c75def524aa1e2 SHA512 b9416c195490fb7bc87fcaab58d79c1b13a63e577d0496ffae22ea901dfdd445a2b7b3197f0cc97c60339455fd2c687679f392787af5595cc167777364551485
 DIST hydrus-472.tar.gz 39421962 BLAKE2B 2e7ac5d5169aed1d9437434514d878ce175bfe13116f8972b2a21532e0058ce09d9a55744e17b71d1755ebc8436d6f2ff4995dd81c9a49844aff42e60cd2564f SHA512 5b3eecf724fd2e6dede39bbf33665607294d7f345baf052fe379a241d6ee157550ca390d32bb1b256c1fee2224190b54ba9d7d0718ec10b147580eb1f5216b34
+DIST hydrus-473.tar.gz 40044270 BLAKE2B 1aecc84aa60318fadffcf3ad3d8358fa4f537ca1ca55ae7ce02aade0e44b266f42ae94c423854874c471e1d8dc0988e232d19f2e5dd4e2d12834055b75814e9a SHA512 372e813deaef82fe02686e4d7fe5f9ab15476a954b53da8b3560a4cf45ad44209b22b727c32510714ff937b0e6116dae403b3a69954e51c5e62b67bea4eda808

diff --git a/media-gfx/hydrus/hydrus-467.ebuild b/media-gfx/hydrus/hydrus-473.ebuild
similarity index 100%
rename from media-gfx/hydrus/hydrus-467.ebuild
rename to media-gfx/hydrus/hydrus-473.ebuild


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2022-02-23  4:05 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2022-02-23  4:05 UTC (permalink / raw
  To: gentoo-commits

commit:     3634a47e4e5e173046ad2c75eb434966916aa993
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Tue Feb 22 08:14:29 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 23 03:55:35 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3634a47e

media-gfx/hydrus: Drop 468, add 474

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://github.com/gentoo/gentoo/pull/24310
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/Manifest                                    | 2 +-
 media-gfx/hydrus/{hydrus-468-r1.ebuild => hydrus-474.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index d335a49a81ab..3cbed5835371 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,4 +1,4 @@
-DIST hydrus-468.tar.gz 39392634 BLAKE2B a6dd22e388a0f4d5b312985ea6686ee18fb51dd149188c3877ec3a44f1a2013617770a0b1234b862e9096ca1d61925fcf8dbd2f5871e44fdd695662651f5cec1 SHA512 0c6f6730304e1f48496bad0eae1694e2d5bb674bcf049555658f55246a03a9105e4e4a12534256c1c08e8337ed9dfaf0ae8f68a40b70a7e532df0ac6365e9fb6
 DIST hydrus-469.tar.gz 39398328 BLAKE2B e10791db063c9cde1e204c353f27f4f1875e8a1f6981cf2d4f79fa6dbe55958be2ec310bdf77d640ff7b0cb7528870e34209cfde00035e1b29c75def524aa1e2 SHA512 b9416c195490fb7bc87fcaab58d79c1b13a63e577d0496ffae22ea901dfdd445a2b7b3197f0cc97c60339455fd2c687679f392787af5595cc167777364551485
 DIST hydrus-472.tar.gz 39421962 BLAKE2B 2e7ac5d5169aed1d9437434514d878ce175bfe13116f8972b2a21532e0058ce09d9a55744e17b71d1755ebc8436d6f2ff4995dd81c9a49844aff42e60cd2564f SHA512 5b3eecf724fd2e6dede39bbf33665607294d7f345baf052fe379a241d6ee157550ca390d32bb1b256c1fee2224190b54ba9d7d0718ec10b147580eb1f5216b34
 DIST hydrus-473.tar.gz 40044270 BLAKE2B 1aecc84aa60318fadffcf3ad3d8358fa4f537ca1ca55ae7ce02aade0e44b266f42ae94c423854874c471e1d8dc0988e232d19f2e5dd4e2d12834055b75814e9a SHA512 372e813deaef82fe02686e4d7fe5f9ab15476a954b53da8b3560a4cf45ad44209b22b727c32510714ff937b0e6116dae403b3a69954e51c5e62b67bea4eda808
+DIST hydrus-474.tar.gz 40052948 BLAKE2B 7d323caf6dee2dc8a1dcf792a5c3383b395374d0e5a8fd88489b08a5b4ad295317cd5ae1da95d5435fb44ea8d4bbe4038d821c037c156e11d8b8c8a8582d67be SHA512 b73f5823ff84cf84710dd1fd9f9bfedffb6ce9ffaba8e4b23a7eda4a6a206aeaa8993632858fab9a5934f4c279fc23955cf045cd38af7ccf78b1eb73a0940bdb

diff --git a/media-gfx/hydrus/hydrus-468-r1.ebuild b/media-gfx/hydrus/hydrus-474.ebuild
similarity index 100%
rename from media-gfx/hydrus/hydrus-468-r1.ebuild
rename to media-gfx/hydrus/hydrus-474.ebuild


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2022-03-10 22:26 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2022-03-10 22:26 UTC (permalink / raw
  To: gentoo-commits

commit:     f57310b3456d3d871446401fc9fe12ebabf137d1
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Thu Mar 10 09:49:46 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 10 22:25:28 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f57310b3

media-gfx/hydrus: Drop 469, add 476, update 9999

The documentation has been changed to use mkdocs instead of plain html,
therefore the ebuild had to be adapted for this. Additionally, the
license.txt file turned out to not be a duplicate, but instead used by
the program to show the license, it therefore has to be in the same
directory as the program and not in the doc directory.

Closes: https://bugs.gentoo.org/834921
Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://github.com/gentoo/gentoo/pull/24471
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/Manifest                            |  2 +-
 .../hydrus/{hydrus-469.ebuild => hydrus-476.ebuild}  | 20 ++++++++++++--------
 media-gfx/hydrus/hydrus-9999.ebuild                  | 20 ++++++++++++--------
 3 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 3cbed5835371..6feab9e3d28c 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,4 +1,4 @@
-DIST hydrus-469.tar.gz 39398328 BLAKE2B e10791db063c9cde1e204c353f27f4f1875e8a1f6981cf2d4f79fa6dbe55958be2ec310bdf77d640ff7b0cb7528870e34209cfde00035e1b29c75def524aa1e2 SHA512 b9416c195490fb7bc87fcaab58d79c1b13a63e577d0496ffae22ea901dfdd445a2b7b3197f0cc97c60339455fd2c687679f392787af5595cc167777364551485
 DIST hydrus-472.tar.gz 39421962 BLAKE2B 2e7ac5d5169aed1d9437434514d878ce175bfe13116f8972b2a21532e0058ce09d9a55744e17b71d1755ebc8436d6f2ff4995dd81c9a49844aff42e60cd2564f SHA512 5b3eecf724fd2e6dede39bbf33665607294d7f345baf052fe379a241d6ee157550ca390d32bb1b256c1fee2224190b54ba9d7d0718ec10b147580eb1f5216b34
 DIST hydrus-473.tar.gz 40044270 BLAKE2B 1aecc84aa60318fadffcf3ad3d8358fa4f537ca1ca55ae7ce02aade0e44b266f42ae94c423854874c471e1d8dc0988e232d19f2e5dd4e2d12834055b75814e9a SHA512 372e813deaef82fe02686e4d7fe5f9ab15476a954b53da8b3560a4cf45ad44209b22b727c32510714ff937b0e6116dae403b3a69954e51c5e62b67bea4eda808
 DIST hydrus-474.tar.gz 40052948 BLAKE2B 7d323caf6dee2dc8a1dcf792a5c3383b395374d0e5a8fd88489b08a5b4ad295317cd5ae1da95d5435fb44ea8d4bbe4038d821c037c156e11d8b8c8a8582d67be SHA512 b73f5823ff84cf84710dd1fd9f9bfedffb6ce9ffaba8e4b23a7eda4a6a206aeaa8993632858fab9a5934f4c279fc23955cf045cd38af7ccf78b1eb73a0940bdb
+DIST hydrus-476.tar.gz 40139397 BLAKE2B 68a3f31a8f250b2c129a9f2562624ec98994e338112eba4f0953aa96dd95abdb97fc60f6a8f28efb5a660f543f596a344a13fe234b3ffb11e6a158b795b0a11c SHA512 5aa59cc2e4d72219d24de10eaeb99ad5b13c0de3af8d9c7e55e3ccea3b897077596401d4d034aac05c018a969f84507618f95ef70d422ac57075bf2d64a692c5

diff --git a/media-gfx/hydrus/hydrus-469.ebuild b/media-gfx/hydrus/hydrus-476.ebuild
similarity index 85%
rename from media-gfx/hydrus/hydrus-469.ebuild
rename to media-gfx/hydrus/hydrus-476.ebuild
index f45dbc3ac8ef..2e1663b11f1f 100644
--- a/media-gfx/hydrus/hydrus-469.ebuild
+++ b/media-gfx/hydrus/hydrus-476.ebuild
@@ -6,7 +6,10 @@ EAPI=7
 PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="sqlite"
 
-inherit python-single-r1 desktop optfeature
+DOCS_BUILDER=mkdocs
+DOCS_DEPEND="dev-python/mkdocs-material"
+
+inherit python-single-r1 desktop docs optfeature
 
 DESCRIPTION="A booru-like media organizer for the desktop"
 HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
@@ -82,14 +85,13 @@ src_prepare() {
 	rm -r bin/ || die
 	# Build files used for CI, not actually needed
 	rm -r static/build_files || die
-	# Duplicate license file, not needed
-	rm license.txt || die
 	# Python requirements files, not needed
 	rm requirements_*.txt || die
 }
 
 src_compile() {
 	python_optimize "${S}"
+	docs_compile
 }
 
 src_test() {
@@ -107,18 +109,20 @@ src_install() {
 
 	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
 
-	local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/)
-	local HTML_DOCS=("${S}"/help/)
+	local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/)
 	einstalldocs
 
 	# Files only needed for testing
 	rm test.py hydrus/hydrus_test.py || die
 	rm -r hydrus/test/ static/testing/ || die
 
-	# These files are copied into doc
-	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
+	# ${S}/_build = ${DOCS_OUTDIR}/.. and these have already been copied, remove it before installation
+	# ${DOCS[@]} files are copied into doc
+	# ${S}/docs/ is the markdown source code for documentation
+	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
+	rm -r "${S}/_build" "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
 	# The program expects to find documentation here, so add a symlink to doc
-	dosym "${doc}/html/help" /opt/hydrus/help
+	dosym "${doc}/html" /opt/hydrus/help
 
 	insinto /opt/hydrus
 	doins -r "${S}"/.

diff --git a/media-gfx/hydrus/hydrus-9999.ebuild b/media-gfx/hydrus/hydrus-9999.ebuild
index f45dbc3ac8ef..2e1663b11f1f 100644
--- a/media-gfx/hydrus/hydrus-9999.ebuild
+++ b/media-gfx/hydrus/hydrus-9999.ebuild
@@ -6,7 +6,10 @@ EAPI=7
 PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="sqlite"
 
-inherit python-single-r1 desktop optfeature
+DOCS_BUILDER=mkdocs
+DOCS_DEPEND="dev-python/mkdocs-material"
+
+inherit python-single-r1 desktop docs optfeature
 
 DESCRIPTION="A booru-like media organizer for the desktop"
 HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
@@ -82,14 +85,13 @@ src_prepare() {
 	rm -r bin/ || die
 	# Build files used for CI, not actually needed
 	rm -r static/build_files || die
-	# Duplicate license file, not needed
-	rm license.txt || die
 	# Python requirements files, not needed
 	rm requirements_*.txt || die
 }
 
 src_compile() {
 	python_optimize "${S}"
+	docs_compile
 }
 
 src_test() {
@@ -107,18 +109,20 @@ src_install() {
 
 	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
 
-	local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/)
-	local HTML_DOCS=("${S}"/help/)
+	local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/)
 	einstalldocs
 
 	# Files only needed for testing
 	rm test.py hydrus/hydrus_test.py || die
 	rm -r hydrus/test/ static/testing/ || die
 
-	# These files are copied into doc
-	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
+	# ${S}/_build = ${DOCS_OUTDIR}/.. and these have already been copied, remove it before installation
+	# ${DOCS[@]} files are copied into doc
+	# ${S}/docs/ is the markdown source code for documentation
+	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
+	rm -r "${S}/_build" "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
 	# The program expects to find documentation here, so add a symlink to doc
-	dosym "${doc}/html/help" /opt/hydrus/help
+	dosym "${doc}/html" /opt/hydrus/help
 
 	insinto /opt/hydrus
 	doins -r "${S}"/.


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2022-03-11 14:37 Joonas Niilola
  0 siblings, 0 replies; 104+ messages in thread
From: Joonas Niilola @ 2022-03-11 14:37 UTC (permalink / raw
  To: gentoo-commits

commit:     a129a441c8d8daea825f8d9162735fa95e2c18d4
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Fri Mar 11 08:33:27 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Mar 11 14:37:20 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a129a441

media-gfx/hydrus: Fix building without the doc flag

Closes: https://bugs.gentoo.org/834950
Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://github.com/gentoo/gentoo/pull/24482
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/hydrus/hydrus-476.ebuild  | 11 +++++++----
 media-gfx/hydrus/hydrus-9999.ebuild | 11 +++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/media-gfx/hydrus/hydrus-476.ebuild b/media-gfx/hydrus/hydrus-476.ebuild
index 2e1663b11f1f..74762f9de40f 100644
--- a/media-gfx/hydrus/hydrus-476.ebuild
+++ b/media-gfx/hydrus/hydrus-476.ebuild
@@ -116,13 +116,16 @@ src_install() {
 	rm test.py hydrus/hydrus_test.py || die
 	rm -r hydrus/test/ static/testing/ || die
 
-	# ${S}/_build = ${DOCS_OUTDIR}/.. and these have already been copied, remove it before installation
 	# ${DOCS[@]} files are copied into doc
 	# ${S}/docs/ is the markdown source code for documentation
 	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
-	rm -r "${S}/_build" "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
-	# The program expects to find documentation here, so add a symlink to doc
-	dosym "${doc}/html" /opt/hydrus/help
+	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
+	if use doc; then
+		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
+		rm -r "${S}/_build" || die
+		# The program expects to find documentation here, so add a symlink to doc
+		dosym "${doc}/html" /opt/hydrus/help
+	fi
 
 	insinto /opt/hydrus
 	doins -r "${S}"/.

diff --git a/media-gfx/hydrus/hydrus-9999.ebuild b/media-gfx/hydrus/hydrus-9999.ebuild
index 2e1663b11f1f..74762f9de40f 100644
--- a/media-gfx/hydrus/hydrus-9999.ebuild
+++ b/media-gfx/hydrus/hydrus-9999.ebuild
@@ -116,13 +116,16 @@ src_install() {
 	rm test.py hydrus/hydrus_test.py || die
 	rm -r hydrus/test/ static/testing/ || die
 
-	# ${S}/_build = ${DOCS_OUTDIR}/.. and these have already been copied, remove it before installation
 	# ${DOCS[@]} files are copied into doc
 	# ${S}/docs/ is the markdown source code for documentation
 	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
-	rm -r "${S}/_build" "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
-	# The program expects to find documentation here, so add a symlink to doc
-	dosym "${doc}/html" /opt/hydrus/help
+	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
+	if use doc; then
+		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
+		rm -r "${S}/_build" || die
+		# The program expects to find documentation here, so add a symlink to doc
+		dosym "${doc}/html" /opt/hydrus/help
+	fi
 
 	insinto /opt/hydrus
 	doins -r "${S}"/.


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2022-03-31 13:36 Joonas Niilola
  0 siblings, 0 replies; 104+ messages in thread
From: Joonas Niilola @ 2022-03-31 13:36 UTC (permalink / raw
  To: gentoo-commits

commit:     8cfeb9d38290bd94e74dab35cb8617d28b115eee
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Sat Mar 26 13:32:52 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Mar 31 13:36:26 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cfeb9d3

media-gfx/hydrus: Drop 472, add 478

The program now depends on cbor2

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://github.com/gentoo/gentoo/pull/24759
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/hydrus/Manifest                          |  2 +-
 .../{hydrus-472.ebuild => hydrus-478.ebuild}       | 28 ++++++++++++++--------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 6feab9e3d28c..112b857a11bf 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,4 +1,4 @@
-DIST hydrus-472.tar.gz 39421962 BLAKE2B 2e7ac5d5169aed1d9437434514d878ce175bfe13116f8972b2a21532e0058ce09d9a55744e17b71d1755ebc8436d6f2ff4995dd81c9a49844aff42e60cd2564f SHA512 5b3eecf724fd2e6dede39bbf33665607294d7f345baf052fe379a241d6ee157550ca390d32bb1b256c1fee2224190b54ba9d7d0718ec10b147580eb1f5216b34
 DIST hydrus-473.tar.gz 40044270 BLAKE2B 1aecc84aa60318fadffcf3ad3d8358fa4f537ca1ca55ae7ce02aade0e44b266f42ae94c423854874c471e1d8dc0988e232d19f2e5dd4e2d12834055b75814e9a SHA512 372e813deaef82fe02686e4d7fe5f9ab15476a954b53da8b3560a4cf45ad44209b22b727c32510714ff937b0e6116dae403b3a69954e51c5e62b67bea4eda808
 DIST hydrus-474.tar.gz 40052948 BLAKE2B 7d323caf6dee2dc8a1dcf792a5c3383b395374d0e5a8fd88489b08a5b4ad295317cd5ae1da95d5435fb44ea8d4bbe4038d821c037c156e11d8b8c8a8582d67be SHA512 b73f5823ff84cf84710dd1fd9f9bfedffb6ce9ffaba8e4b23a7eda4a6a206aeaa8993632858fab9a5934f4c279fc23955cf045cd38af7ccf78b1eb73a0940bdb
 DIST hydrus-476.tar.gz 40139397 BLAKE2B 68a3f31a8f250b2c129a9f2562624ec98994e338112eba4f0953aa96dd95abdb97fc60f6a8f28efb5a660f543f596a344a13fe234b3ffb11e6a158b795b0a11c SHA512 5aa59cc2e4d72219d24de10eaeb99ad5b13c0de3af8d9c7e55e3ccea3b897077596401d4d034aac05c018a969f84507618f95ef70d422ac57075bf2d64a692c5
+DIST hydrus-478.tar.gz 40150962 BLAKE2B d654d2c12de8c8af6212679ed719892bcb6172d0b2120718e1bca7159ea3ab0f509dd01bf7c6f57f7da4d5e711c7b85cd0ce467ebc5fe0b08214085e3ca13cc5 SHA512 eb92071e0c9a0c3d04ef72336feaa55e47d28c523916484090220f30fa137c7d6b09b1d97e214fd191212a54e5d653eba08cfa1fe3f242a488d22cc331279e9b

diff --git a/media-gfx/hydrus/hydrus-472.ebuild b/media-gfx/hydrus/hydrus-478.ebuild
similarity index 81%
rename from media-gfx/hydrus/hydrus-472.ebuild
rename to media-gfx/hydrus/hydrus-478.ebuild
index aa080605c68f..eeb2fa504f8a 100644
--- a/media-gfx/hydrus/hydrus-472.ebuild
+++ b/media-gfx/hydrus/hydrus-478.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,10 @@ EAPI=7
 PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="sqlite"
 
-inherit python-single-r1 desktop optfeature
+DOCS_BUILDER=mkdocs
+DOCS_DEPEND="dev-python/mkdocs-material"
+
+inherit python-single-r1 desktop docs optfeature
 
 DESCRIPTION="A booru-like media organizer for the desktop"
 HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
@@ -36,6 +39,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
+		dev-python/cbor2[${PYTHON_USEDEP}]
 		dev-python/chardet[${PYTHON_USEDEP}]
 		dev-python/cloudscraper[${PYTHON_USEDEP}]
 		dev-python/html5lib[${PYTHON_USEDEP}]
@@ -82,14 +86,13 @@ src_prepare() {
 	rm -r bin/ || die
 	# Build files used for CI, not actually needed
 	rm -r static/build_files || die
-	# Duplicate license file, not needed
-	rm license.txt || die
 	# Python requirements files, not needed
 	rm requirements_*.txt || die
 }
 
 src_compile() {
 	python_optimize "${S}"
+	docs_compile
 }
 
 src_test() {
@@ -107,18 +110,23 @@ src_install() {
 
 	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
 
-	local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/)
-	local HTML_DOCS=("${S}"/help/)
+	local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/)
 	einstalldocs
 
 	# Files only needed for testing
 	rm test.py hydrus/hydrus_test.py || die
 	rm -r hydrus/test/ static/testing/ || die
 
-	# These files are copied into doc
-	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
-	# The program expects to find documentation here, so add a symlink to doc
-	dosym "${doc}/html/help" /opt/hydrus/help
+	# ${DOCS[@]} files are copied into doc
+	# ${S}/docs/ is the markdown source code for documentation
+	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
+	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
+	if use doc; then
+		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
+		rm -r "${S}/_build" || die
+		# The program expects to find documentation here, so add a symlink to doc
+		dosym "${doc}/html" /opt/hydrus/help
+	fi
 
 	insinto /opt/hydrus
 	doins -r "${S}"/.


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2022-04-14 11:51 Joonas Niilola
  0 siblings, 0 replies; 104+ messages in thread
From: Joonas Niilola @ 2022-04-14 11:51 UTC (permalink / raw
  To: gentoo-commits

commit:     3d4662739d596e922885ddec51dc4ea9cf5b257c
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Tue Apr  5 07:54:53 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Apr 14 11:51:22 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d466273

media-gfx/hydrus: Add 479, drop 473, update 9999

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://github.com/gentoo/gentoo/pull/24915
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/hydrus/Manifest                          |  2 +-
 .../{hydrus-473.ebuild => hydrus-479.ebuild}       | 28 ++++++++++++++--------
 media-gfx/hydrus/hydrus-9999.ebuild                |  1 +
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 112b857a11bf..4fa241399a03 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,4 +1,4 @@
-DIST hydrus-473.tar.gz 40044270 BLAKE2B 1aecc84aa60318fadffcf3ad3d8358fa4f537ca1ca55ae7ce02aade0e44b266f42ae94c423854874c471e1d8dc0988e232d19f2e5dd4e2d12834055b75814e9a SHA512 372e813deaef82fe02686e4d7fe5f9ab15476a954b53da8b3560a4cf45ad44209b22b727c32510714ff937b0e6116dae403b3a69954e51c5e62b67bea4eda808
 DIST hydrus-474.tar.gz 40052948 BLAKE2B 7d323caf6dee2dc8a1dcf792a5c3383b395374d0e5a8fd88489b08a5b4ad295317cd5ae1da95d5435fb44ea8d4bbe4038d821c037c156e11d8b8c8a8582d67be SHA512 b73f5823ff84cf84710dd1fd9f9bfedffb6ce9ffaba8e4b23a7eda4a6a206aeaa8993632858fab9a5934f4c279fc23955cf045cd38af7ccf78b1eb73a0940bdb
 DIST hydrus-476.tar.gz 40139397 BLAKE2B 68a3f31a8f250b2c129a9f2562624ec98994e338112eba4f0953aa96dd95abdb97fc60f6a8f28efb5a660f543f596a344a13fe234b3ffb11e6a158b795b0a11c SHA512 5aa59cc2e4d72219d24de10eaeb99ad5b13c0de3af8d9c7e55e3ccea3b897077596401d4d034aac05c018a969f84507618f95ef70d422ac57075bf2d64a692c5
 DIST hydrus-478.tar.gz 40150962 BLAKE2B d654d2c12de8c8af6212679ed719892bcb6172d0b2120718e1bca7159ea3ab0f509dd01bf7c6f57f7da4d5e711c7b85cd0ce467ebc5fe0b08214085e3ca13cc5 SHA512 eb92071e0c9a0c3d04ef72336feaa55e47d28c523916484090220f30fa137c7d6b09b1d97e214fd191212a54e5d653eba08cfa1fe3f242a488d22cc331279e9b
+DIST hydrus-479.tar.gz 40164261 BLAKE2B 9c9b60c831a84414632a6ddbe51ece66d036aaa1f98cc74f112ee668583fb4ad95572a25e98cfc8d5c9d6886b55110b373534addb27bf9bec5f9bec53b69e8f7 SHA512 7f08fa62c7bcae17a80aca47dc5fcaf1641622590b08fecd3f38749467e7c595d5b49672145df00f480e99e3270e8bb4d98a21053d9eaeed0f0950956e3026ae

diff --git a/media-gfx/hydrus/hydrus-473.ebuild b/media-gfx/hydrus/hydrus-479.ebuild
similarity index 81%
rename from media-gfx/hydrus/hydrus-473.ebuild
rename to media-gfx/hydrus/hydrus-479.ebuild
index aa080605c68f..eeb2fa504f8a 100644
--- a/media-gfx/hydrus/hydrus-473.ebuild
+++ b/media-gfx/hydrus/hydrus-479.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,10 @@ EAPI=7
 PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="sqlite"
 
-inherit python-single-r1 desktop optfeature
+DOCS_BUILDER=mkdocs
+DOCS_DEPEND="dev-python/mkdocs-material"
+
+inherit python-single-r1 desktop docs optfeature
 
 DESCRIPTION="A booru-like media organizer for the desktop"
 HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
@@ -36,6 +39,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
+		dev-python/cbor2[${PYTHON_USEDEP}]
 		dev-python/chardet[${PYTHON_USEDEP}]
 		dev-python/cloudscraper[${PYTHON_USEDEP}]
 		dev-python/html5lib[${PYTHON_USEDEP}]
@@ -82,14 +86,13 @@ src_prepare() {
 	rm -r bin/ || die
 	# Build files used for CI, not actually needed
 	rm -r static/build_files || die
-	# Duplicate license file, not needed
-	rm license.txt || die
 	# Python requirements files, not needed
 	rm requirements_*.txt || die
 }
 
 src_compile() {
 	python_optimize "${S}"
+	docs_compile
 }
 
 src_test() {
@@ -107,18 +110,23 @@ src_install() {
 
 	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
 
-	local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/)
-	local HTML_DOCS=("${S}"/help/)
+	local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/)
 	einstalldocs
 
 	# Files only needed for testing
 	rm test.py hydrus/hydrus_test.py || die
 	rm -r hydrus/test/ static/testing/ || die
 
-	# These files are copied into doc
-	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
-	# The program expects to find documentation here, so add a symlink to doc
-	dosym "${doc}/html/help" /opt/hydrus/help
+	# ${DOCS[@]} files are copied into doc
+	# ${S}/docs/ is the markdown source code for documentation
+	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
+	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
+	if use doc; then
+		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
+		rm -r "${S}/_build" || die
+		# The program expects to find documentation here, so add a symlink to doc
+		dosym "${doc}/html" /opt/hydrus/help
+	fi
 
 	insinto /opt/hydrus
 	doins -r "${S}"/.

diff --git a/media-gfx/hydrus/hydrus-9999.ebuild b/media-gfx/hydrus/hydrus-9999.ebuild
index 74762f9de40f..eeb2fa504f8a 100644
--- a/media-gfx/hydrus/hydrus-9999.ebuild
+++ b/media-gfx/hydrus/hydrus-9999.ebuild
@@ -39,6 +39,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
+		dev-python/cbor2[${PYTHON_USEDEP}]
 		dev-python/chardet[${PYTHON_USEDEP}]
 		dev-python/cloudscraper[${PYTHON_USEDEP}]
 		dev-python/html5lib[${PYTHON_USEDEP}]


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2022-04-21 10:33 Joonas Niilola
  0 siblings, 0 replies; 104+ messages in thread
From: Joonas Niilola @ 2022-04-21 10:33 UTC (permalink / raw
  To: gentoo-commits

commit:     d67256ab6e83a4e1d350875fb041fe8bb1cc40a4
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Sat Apr 16 19:46:55 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Apr 21 10:33:25 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d67256ab

media-gfx/hydrus: Drop 474 and 476, add 481 and 482

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://github.com/gentoo/gentoo/pull/25049
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/hydrus/Manifest                          |  4 ++--
 .../{hydrus-476.ebuild => hydrus-481.ebuild}       |  1 +
 .../{hydrus-474.ebuild => hydrus-482.ebuild}       | 26 ++++++++++++++--------
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 4fa241399a03..93aef0982c85 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,4 +1,4 @@
-DIST hydrus-474.tar.gz 40052948 BLAKE2B 7d323caf6dee2dc8a1dcf792a5c3383b395374d0e5a8fd88489b08a5b4ad295317cd5ae1da95d5435fb44ea8d4bbe4038d821c037c156e11d8b8c8a8582d67be SHA512 b73f5823ff84cf84710dd1fd9f9bfedffb6ce9ffaba8e4b23a7eda4a6a206aeaa8993632858fab9a5934f4c279fc23955cf045cd38af7ccf78b1eb73a0940bdb
-DIST hydrus-476.tar.gz 40139397 BLAKE2B 68a3f31a8f250b2c129a9f2562624ec98994e338112eba4f0953aa96dd95abdb97fc60f6a8f28efb5a660f543f596a344a13fe234b3ffb11e6a158b795b0a11c SHA512 5aa59cc2e4d72219d24de10eaeb99ad5b13c0de3af8d9c7e55e3ccea3b897077596401d4d034aac05c018a969f84507618f95ef70d422ac57075bf2d64a692c5
 DIST hydrus-478.tar.gz 40150962 BLAKE2B d654d2c12de8c8af6212679ed719892bcb6172d0b2120718e1bca7159ea3ab0f509dd01bf7c6f57f7da4d5e711c7b85cd0ce467ebc5fe0b08214085e3ca13cc5 SHA512 eb92071e0c9a0c3d04ef72336feaa55e47d28c523916484090220f30fa137c7d6b09b1d97e214fd191212a54e5d653eba08cfa1fe3f242a488d22cc331279e9b
 DIST hydrus-479.tar.gz 40164261 BLAKE2B 9c9b60c831a84414632a6ddbe51ece66d036aaa1f98cc74f112ee668583fb4ad95572a25e98cfc8d5c9d6886b55110b373534addb27bf9bec5f9bec53b69e8f7 SHA512 7f08fa62c7bcae17a80aca47dc5fcaf1641622590b08fecd3f38749467e7c595d5b49672145df00f480e99e3270e8bb4d98a21053d9eaeed0f0950956e3026ae
+DIST hydrus-481.tar.gz 40174593 BLAKE2B 8a5745803e0e461af550d2fa5bc430acc18e9d54bc2534d9b47ad237b41110cc4b2960dc06176c52b462f91a156d8e8bf2fe8dd15b62d58bb1ea4c0f02587ac7 SHA512 e96fae770003fe6128043a0ddff3c0c7fd5eae457970de3af6d3c4f4da207502cfd78cc6ea96c3284543ba509625376e19ca386db3933c07c2346321f81bfe10
+DIST hydrus-482.tar.gz 40181613 BLAKE2B bdb98ae88efb9e83bda28d01dcdb624ce884682893e84087bfc99420e82ff12c1543f89a5015ac997596188a3b32fec9e5776f1c89fe1864f55d73ae52ca19d7 SHA512 c99a0ea60c0b3a565b57b4f4201eb6ff732ea2fb9f419d8b9e8170476bb230bdf0e474e5f82f909b4aca0a442fe89e47d4d0f58b0e722b3f309940d98664ac51

diff --git a/media-gfx/hydrus/hydrus-476.ebuild b/media-gfx/hydrus/hydrus-481.ebuild
similarity index 99%
rename from media-gfx/hydrus/hydrus-476.ebuild
rename to media-gfx/hydrus/hydrus-481.ebuild
index 74762f9de40f..eeb2fa504f8a 100644
--- a/media-gfx/hydrus/hydrus-476.ebuild
+++ b/media-gfx/hydrus/hydrus-481.ebuild
@@ -39,6 +39,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
+		dev-python/cbor2[${PYTHON_USEDEP}]
 		dev-python/chardet[${PYTHON_USEDEP}]
 		dev-python/cloudscraper[${PYTHON_USEDEP}]
 		dev-python/html5lib[${PYTHON_USEDEP}]

diff --git a/media-gfx/hydrus/hydrus-474.ebuild b/media-gfx/hydrus/hydrus-482.ebuild
similarity index 82%
rename from media-gfx/hydrus/hydrus-474.ebuild
rename to media-gfx/hydrus/hydrus-482.ebuild
index f45dbc3ac8ef..eeb2fa504f8a 100644
--- a/media-gfx/hydrus/hydrus-474.ebuild
+++ b/media-gfx/hydrus/hydrus-482.ebuild
@@ -6,7 +6,10 @@ EAPI=7
 PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="sqlite"
 
-inherit python-single-r1 desktop optfeature
+DOCS_BUILDER=mkdocs
+DOCS_DEPEND="dev-python/mkdocs-material"
+
+inherit python-single-r1 desktop docs optfeature
 
 DESCRIPTION="A booru-like media organizer for the desktop"
 HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
@@ -36,6 +39,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
+		dev-python/cbor2[${PYTHON_USEDEP}]
 		dev-python/chardet[${PYTHON_USEDEP}]
 		dev-python/cloudscraper[${PYTHON_USEDEP}]
 		dev-python/html5lib[${PYTHON_USEDEP}]
@@ -82,14 +86,13 @@ src_prepare() {
 	rm -r bin/ || die
 	# Build files used for CI, not actually needed
 	rm -r static/build_files || die
-	# Duplicate license file, not needed
-	rm license.txt || die
 	# Python requirements files, not needed
 	rm requirements_*.txt || die
 }
 
 src_compile() {
 	python_optimize "${S}"
+	docs_compile
 }
 
 src_test() {
@@ -107,18 +110,23 @@ src_install() {
 
 	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
 
-	local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/)
-	local HTML_DOCS=("${S}"/help/)
+	local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/)
 	einstalldocs
 
 	# Files only needed for testing
 	rm test.py hydrus/hydrus_test.py || die
 	rm -r hydrus/test/ static/testing/ || die
 
-	# These files are copied into doc
-	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
-	# The program expects to find documentation here, so add a symlink to doc
-	dosym "${doc}/html/help" /opt/hydrus/help
+	# ${DOCS[@]} files are copied into doc
+	# ${S}/docs/ is the markdown source code for documentation
+	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
+	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
+	if use doc; then
+		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
+		rm -r "${S}/_build" || die
+		# The program expects to find documentation here, so add a symlink to doc
+		dosym "${doc}/html" /opt/hydrus/help
+	fi
 
 	insinto /opt/hydrus
 	doins -r "${S}"/.


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2022-05-13 20:12 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2022-05-13 20:12 UTC (permalink / raw
  To: gentoo-commits

commit:     a18bcdaae124f822503e2de32837a64c9ead6ba5
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Thu May 12 11:10:03 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 13 20:12:41 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a18bcdaa

media-gfx/hydrus: Drop 478, add 484

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://github.com/gentoo/gentoo/pull/25454
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/Manifest                                 | 2 +-
 media-gfx/hydrus/{hydrus-478.ebuild => hydrus-484.ebuild} | 2 +-
 media-gfx/hydrus/hydrus-9999.ebuild                       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 93aef0982c85..6c30577b3d2f 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,4 +1,4 @@
-DIST hydrus-478.tar.gz 40150962 BLAKE2B d654d2c12de8c8af6212679ed719892bcb6172d0b2120718e1bca7159ea3ab0f509dd01bf7c6f57f7da4d5e711c7b85cd0ce467ebc5fe0b08214085e3ca13cc5 SHA512 eb92071e0c9a0c3d04ef72336feaa55e47d28c523916484090220f30fa137c7d6b09b1d97e214fd191212a54e5d653eba08cfa1fe3f242a488d22cc331279e9b
 DIST hydrus-479.tar.gz 40164261 BLAKE2B 9c9b60c831a84414632a6ddbe51ece66d036aaa1f98cc74f112ee668583fb4ad95572a25e98cfc8d5c9d6886b55110b373534addb27bf9bec5f9bec53b69e8f7 SHA512 7f08fa62c7bcae17a80aca47dc5fcaf1641622590b08fecd3f38749467e7c595d5b49672145df00f480e99e3270e8bb4d98a21053d9eaeed0f0950956e3026ae
 DIST hydrus-481.tar.gz 40174593 BLAKE2B 8a5745803e0e461af550d2fa5bc430acc18e9d54bc2534d9b47ad237b41110cc4b2960dc06176c52b462f91a156d8e8bf2fe8dd15b62d58bb1ea4c0f02587ac7 SHA512 e96fae770003fe6128043a0ddff3c0c7fd5eae457970de3af6d3c4f4da207502cfd78cc6ea96c3284543ba509625376e19ca386db3933c07c2346321f81bfe10
 DIST hydrus-482.tar.gz 40181613 BLAKE2B bdb98ae88efb9e83bda28d01dcdb624ce884682893e84087bfc99420e82ff12c1543f89a5015ac997596188a3b32fec9e5776f1c89fe1864f55d73ae52ca19d7 SHA512 c99a0ea60c0b3a565b57b4f4201eb6ff732ea2fb9f419d8b9e8170476bb230bdf0e474e5f82f909b4aca0a442fe89e47d4d0f58b0e722b3f309940d98664ac51
+DIST hydrus-484.tar.gz 40079506 BLAKE2B 7d3c817511f20476647058bc83ba297f7e597f1fc24cb6c6dc46bb4e1821a0073e4d39fd95a130a89270e77d4b1b749e4a2845ab3c8b471f6cc8b5bba8c65480 SHA512 7eb42fbd15b6140258dd8931d0ff07464fd5ac1d0c8323a84bc89f6f820756cce2a2a3d5e6cd8f536f00f2b6f6d1ea36ab7ce8e4ea08272d30122b46ede69124

diff --git a/media-gfx/hydrus/hydrus-478.ebuild b/media-gfx/hydrus/hydrus-484.ebuild
similarity index 99%
rename from media-gfx/hydrus/hydrus-478.ebuild
rename to media-gfx/hydrus/hydrus-484.ebuild
index eeb2fa504f8a..86568b05547c 100644
--- a/media-gfx/hydrus/hydrus-478.ebuild
+++ b/media-gfx/hydrus/hydrus-484.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite"
 
 DOCS_BUILDER=mkdocs

diff --git a/media-gfx/hydrus/hydrus-9999.ebuild b/media-gfx/hydrus/hydrus-9999.ebuild
index eeb2fa504f8a..86568b05547c 100644
--- a/media-gfx/hydrus/hydrus-9999.ebuild
+++ b/media-gfx/hydrus/hydrus-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite"
 
 DOCS_BUILDER=mkdocs


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2022-07-02 17:35 Joonas Niilola
  0 siblings, 0 replies; 104+ messages in thread
From: Joonas Niilola @ 2022-07-02 17:35 UTC (permalink / raw
  To: gentoo-commits

commit:     4fcd307c2caa43b7dfe8192cca778c6aa4521eed
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Mon Jun 13 09:05:57 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Jul  2 17:35:16 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fcd307c

media-gfx/hydrus: Add 488, drop 479

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://github.com/gentoo/gentoo/pull/25871
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/hydrus/Manifest                                 | 2 +-
 media-gfx/hydrus/{hydrus-479.ebuild => hydrus-488.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 6c30577b3d2f..759fe0c845d8 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,4 +1,4 @@
-DIST hydrus-479.tar.gz 40164261 BLAKE2B 9c9b60c831a84414632a6ddbe51ece66d036aaa1f98cc74f112ee668583fb4ad95572a25e98cfc8d5c9d6886b55110b373534addb27bf9bec5f9bec53b69e8f7 SHA512 7f08fa62c7bcae17a80aca47dc5fcaf1641622590b08fecd3f38749467e7c595d5b49672145df00f480e99e3270e8bb4d98a21053d9eaeed0f0950956e3026ae
 DIST hydrus-481.tar.gz 40174593 BLAKE2B 8a5745803e0e461af550d2fa5bc430acc18e9d54bc2534d9b47ad237b41110cc4b2960dc06176c52b462f91a156d8e8bf2fe8dd15b62d58bb1ea4c0f02587ac7 SHA512 e96fae770003fe6128043a0ddff3c0c7fd5eae457970de3af6d3c4f4da207502cfd78cc6ea96c3284543ba509625376e19ca386db3933c07c2346321f81bfe10
 DIST hydrus-482.tar.gz 40181613 BLAKE2B bdb98ae88efb9e83bda28d01dcdb624ce884682893e84087bfc99420e82ff12c1543f89a5015ac997596188a3b32fec9e5776f1c89fe1864f55d73ae52ca19d7 SHA512 c99a0ea60c0b3a565b57b4f4201eb6ff732ea2fb9f419d8b9e8170476bb230bdf0e474e5f82f909b4aca0a442fe89e47d4d0f58b0e722b3f309940d98664ac51
 DIST hydrus-484.tar.gz 40079506 BLAKE2B 7d3c817511f20476647058bc83ba297f7e597f1fc24cb6c6dc46bb4e1821a0073e4d39fd95a130a89270e77d4b1b749e4a2845ab3c8b471f6cc8b5bba8c65480 SHA512 7eb42fbd15b6140258dd8931d0ff07464fd5ac1d0c8323a84bc89f6f820756cce2a2a3d5e6cd8f536f00f2b6f6d1ea36ab7ce8e4ea08272d30122b46ede69124
+DIST hydrus-488.tar.gz 40428970 BLAKE2B 7a6252276cf60ab4969591d6cf44bf13eec167b432ed0cd5c0ced96f32363640aa246db1256e20e452fe1a6521011c2d46100c3148c0d3241cb810fcde47ad1b SHA512 cbb6a2d1794c5de4c5495a61f115722b1bbad79f3458315586c383eaff79a1f0c144c4498a7c8f651b8ce5592c22ffcc61496a3637471d9ffdeffaef500cd998

diff --git a/media-gfx/hydrus/hydrus-479.ebuild b/media-gfx/hydrus/hydrus-488.ebuild
similarity index 99%
rename from media-gfx/hydrus/hydrus-479.ebuild
rename to media-gfx/hydrus/hydrus-488.ebuild
index eeb2fa504f8a..86568b05547c 100644
--- a/media-gfx/hydrus/hydrus-479.ebuild
+++ b/media-gfx/hydrus/hydrus-488.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite"
 
 DOCS_BUILDER=mkdocs


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2022-07-15  1:47 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2022-07-15  1:47 UTC (permalink / raw
  To: gentoo-commits

commit:     a5538146de2ab9edc7cabe09689b733363515e76
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Thu Jul  7 21:00:32 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 15 01:42:56 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5538146

media-gfx/hydrus: Drop 481, add 490

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://github.com/gentoo/gentoo/pull/26272
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/Manifest                                 | 2 +-
 media-gfx/hydrus/{hydrus-481.ebuild => hydrus-490.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 759fe0c845d8..1e9a551e4209 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,4 +1,4 @@
-DIST hydrus-481.tar.gz 40174593 BLAKE2B 8a5745803e0e461af550d2fa5bc430acc18e9d54bc2534d9b47ad237b41110cc4b2960dc06176c52b462f91a156d8e8bf2fe8dd15b62d58bb1ea4c0f02587ac7 SHA512 e96fae770003fe6128043a0ddff3c0c7fd5eae457970de3af6d3c4f4da207502cfd78cc6ea96c3284543ba509625376e19ca386db3933c07c2346321f81bfe10
 DIST hydrus-482.tar.gz 40181613 BLAKE2B bdb98ae88efb9e83bda28d01dcdb624ce884682893e84087bfc99420e82ff12c1543f89a5015ac997596188a3b32fec9e5776f1c89fe1864f55d73ae52ca19d7 SHA512 c99a0ea60c0b3a565b57b4f4201eb6ff732ea2fb9f419d8b9e8170476bb230bdf0e474e5f82f909b4aca0a442fe89e47d4d0f58b0e722b3f309940d98664ac51
 DIST hydrus-484.tar.gz 40079506 BLAKE2B 7d3c817511f20476647058bc83ba297f7e597f1fc24cb6c6dc46bb4e1821a0073e4d39fd95a130a89270e77d4b1b749e4a2845ab3c8b471f6cc8b5bba8c65480 SHA512 7eb42fbd15b6140258dd8931d0ff07464fd5ac1d0c8323a84bc89f6f820756cce2a2a3d5e6cd8f536f00f2b6f6d1ea36ab7ce8e4ea08272d30122b46ede69124
 DIST hydrus-488.tar.gz 40428970 BLAKE2B 7a6252276cf60ab4969591d6cf44bf13eec167b432ed0cd5c0ced96f32363640aa246db1256e20e452fe1a6521011c2d46100c3148c0d3241cb810fcde47ad1b SHA512 cbb6a2d1794c5de4c5495a61f115722b1bbad79f3458315586c383eaff79a1f0c144c4498a7c8f651b8ce5592c22ffcc61496a3637471d9ffdeffaef500cd998
+DIST hydrus-490.tar.gz 40610222 BLAKE2B 7a6b8fbab2ae64baeeaaa7f0a89a69f5e54719d42b473e7bccd2e549f5d6bc7005831803bd6966af04f4a69d48cf0139a63a2ec17cf34c1190bfb47e422bc821 SHA512 619349d383114774303b6ca5a9239d9d7adfd43db2fde22c17322c630c27b747953932f3d9622b64727714afcb3c70c2b3b065afb75f83dc95ec84eb0c0976ba

diff --git a/media-gfx/hydrus/hydrus-481.ebuild b/media-gfx/hydrus/hydrus-490.ebuild
similarity index 99%
rename from media-gfx/hydrus/hydrus-481.ebuild
rename to media-gfx/hydrus/hydrus-490.ebuild
index eeb2fa504f8a..86568b05547c 100644
--- a/media-gfx/hydrus/hydrus-481.ebuild
+++ b/media-gfx/hydrus/hydrus-490.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite"
 
 DOCS_BUILDER=mkdocs


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2022-07-29  3:16 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2022-07-29  3:16 UTC (permalink / raw
  To: gentoo-commits

commit:     f9011f6370efb84579d2b667992909e8031573d8
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Thu Jul 28 17:07:24 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 29 03:15:53 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9011f63

media-gfx/hydrus: Drop 482, add 493

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://github.com/gentoo/gentoo/pull/26637
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/Manifest                                 | 2 +-
 media-gfx/hydrus/{hydrus-482.ebuild => hydrus-493.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 1e9a551e4209..c5d0431a5c01 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,4 +1,4 @@
-DIST hydrus-482.tar.gz 40181613 BLAKE2B bdb98ae88efb9e83bda28d01dcdb624ce884682893e84087bfc99420e82ff12c1543f89a5015ac997596188a3b32fec9e5776f1c89fe1864f55d73ae52ca19d7 SHA512 c99a0ea60c0b3a565b57b4f4201eb6ff732ea2fb9f419d8b9e8170476bb230bdf0e474e5f82f909b4aca0a442fe89e47d4d0f58b0e722b3f309940d98664ac51
 DIST hydrus-484.tar.gz 40079506 BLAKE2B 7d3c817511f20476647058bc83ba297f7e597f1fc24cb6c6dc46bb4e1821a0073e4d39fd95a130a89270e77d4b1b749e4a2845ab3c8b471f6cc8b5bba8c65480 SHA512 7eb42fbd15b6140258dd8931d0ff07464fd5ac1d0c8323a84bc89f6f820756cce2a2a3d5e6cd8f536f00f2b6f6d1ea36ab7ce8e4ea08272d30122b46ede69124
 DIST hydrus-488.tar.gz 40428970 BLAKE2B 7a6252276cf60ab4969591d6cf44bf13eec167b432ed0cd5c0ced96f32363640aa246db1256e20e452fe1a6521011c2d46100c3148c0d3241cb810fcde47ad1b SHA512 cbb6a2d1794c5de4c5495a61f115722b1bbad79f3458315586c383eaff79a1f0c144c4498a7c8f651b8ce5592c22ffcc61496a3637471d9ffdeffaef500cd998
 DIST hydrus-490.tar.gz 40610222 BLAKE2B 7a6b8fbab2ae64baeeaaa7f0a89a69f5e54719d42b473e7bccd2e549f5d6bc7005831803bd6966af04f4a69d48cf0139a63a2ec17cf34c1190bfb47e422bc821 SHA512 619349d383114774303b6ca5a9239d9d7adfd43db2fde22c17322c630c27b747953932f3d9622b64727714afcb3c70c2b3b065afb75f83dc95ec84eb0c0976ba
+DIST hydrus-493.tar.gz 40623287 BLAKE2B 16d5a4a280fe8f0c80bb3a59596ebe72681a5cb88942f3d02985d338b3a92e3d602983b2b2d294aebe3af98672914e866c33206cc7db3511313e5d5aa994386d SHA512 b0d1d2266ca1d18281144585fc71362d2998eda6fb93363c9309b5f2428484f9a74bbc1102659db6e184239a099ad364182ba0560be72c649181a0ac81f83abd

diff --git a/media-gfx/hydrus/hydrus-482.ebuild b/media-gfx/hydrus/hydrus-493.ebuild
similarity index 99%
rename from media-gfx/hydrus/hydrus-482.ebuild
rename to media-gfx/hydrus/hydrus-493.ebuild
index eeb2fa504f8a..86568b05547c 100644
--- a/media-gfx/hydrus/hydrus-482.ebuild
+++ b/media-gfx/hydrus/hydrus-493.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite"
 
 DOCS_BUILDER=mkdocs


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2022-07-29  3:18 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2022-07-29  3:18 UTC (permalink / raw
  To: gentoo-commits

commit:     89fe586199261e49ac11ab291520eba4065c8341
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 29 03:17:43 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 29 03:17:43 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89fe5861

media-gfx/hydrus: add github upstream metadata

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/media-gfx/hydrus/metadata.xml b/media-gfx/hydrus/metadata.xml
index 94d2b5d6cda9..98c608c2c8b4 100644
--- a/media-gfx/hydrus/metadata.xml
+++ b/media-gfx/hydrus/metadata.xml
@@ -15,4 +15,7 @@
 		anonymously through custom servers that any user may run
 	</longdescription>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">hydrusnetwork/hydrus</remote-id>
+	</upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2022-08-27 11:47 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2022-08-27 11:47 UTC (permalink / raw
  To: gentoo-commits

commit:     6b4be3b8114d52693ac962d58e67592048141ef9
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Mon Aug 22 09:29:25 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Aug 27 11:47:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b4be3b8

media-gfx/hydrus: Drop 488, add 496

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/Manifest                                 | 2 +-
 media-gfx/hydrus/{hydrus-488.ebuild => hydrus-496.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index aede1c8ab427..81d3ecf870a4 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,4 +1,4 @@
-DIST hydrus-488.tar.gz 40428970 BLAKE2B 7a6252276cf60ab4969591d6cf44bf13eec167b432ed0cd5c0ced96f32363640aa246db1256e20e452fe1a6521011c2d46100c3148c0d3241cb810fcde47ad1b SHA512 cbb6a2d1794c5de4c5495a61f115722b1bbad79f3458315586c383eaff79a1f0c144c4498a7c8f651b8ce5592c22ffcc61496a3637471d9ffdeffaef500cd998
 DIST hydrus-490.tar.gz 40610222 BLAKE2B 7a6b8fbab2ae64baeeaaa7f0a89a69f5e54719d42b473e7bccd2e549f5d6bc7005831803bd6966af04f4a69d48cf0139a63a2ec17cf34c1190bfb47e422bc821 SHA512 619349d383114774303b6ca5a9239d9d7adfd43db2fde22c17322c630c27b747953932f3d9622b64727714afcb3c70c2b3b065afb75f83dc95ec84eb0c0976ba
 DIST hydrus-493.tar.gz 40623287 BLAKE2B 16d5a4a280fe8f0c80bb3a59596ebe72681a5cb88942f3d02985d338b3a92e3d602983b2b2d294aebe3af98672914e866c33206cc7db3511313e5d5aa994386d SHA512 b0d1d2266ca1d18281144585fc71362d2998eda6fb93363c9309b5f2428484f9a74bbc1102659db6e184239a099ad364182ba0560be72c649181a0ac81f83abd
 DIST hydrus-495.tar.gz 40638581 BLAKE2B 73a6b0101ec58fa32b421fdb625907e10dae006e902ffa338c952f2daefa42f8a2bb90b42a3bfeec0a351340963c7e6f0ca68e06a6dcc5eff3893f884123ddeb SHA512 5cf69bbc153d3f6a8159a58a6ba798ec03f235bd02c50f10749592e67102dc26b1781a84bd38881fd34809848a1cf7d37e1feeeb4b53fa76976c13a6cbce484e
+DIST hydrus-496.tar.gz 40644118 BLAKE2B 8acb369acb3bbe667d51eeb3de8cceef02585040ae63d50fbbff4b5e8d8f4bac29dc4cd08c9eb8f436a1fc7150bb7eb249ff3f5d13e5a4ee54a2dee877f00208 SHA512 5cc7e4f4f152790659014d675159e121aa65e275231ef43bc3bbd6efe67b458cd821d8858d94e440a1585e0040b242c5ef65368796705242e7eb8e51c62b81bf

diff --git a/media-gfx/hydrus/hydrus-488.ebuild b/media-gfx/hydrus/hydrus-496.ebuild
similarity index 100%
rename from media-gfx/hydrus/hydrus-488.ebuild
rename to media-gfx/hydrus/hydrus-496.ebuild


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2022-08-27 11:47 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2022-08-27 11:47 UTC (permalink / raw
  To: gentoo-commits

commit:     b459c6bfadd1580ada654a4a1e526233ae147e80
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Wed Aug 17 07:54:44 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Aug 27 11:47:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b459c6bf

media-gfx/hydrus: Drop 484, add 495

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/Manifest                                 | 2 +-
 media-gfx/hydrus/{hydrus-484.ebuild => hydrus-495.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index c5d0431a5c01..aede1c8ab427 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,4 +1,4 @@
-DIST hydrus-484.tar.gz 40079506 BLAKE2B 7d3c817511f20476647058bc83ba297f7e597f1fc24cb6c6dc46bb4e1821a0073e4d39fd95a130a89270e77d4b1b749e4a2845ab3c8b471f6cc8b5bba8c65480 SHA512 7eb42fbd15b6140258dd8931d0ff07464fd5ac1d0c8323a84bc89f6f820756cce2a2a3d5e6cd8f536f00f2b6f6d1ea36ab7ce8e4ea08272d30122b46ede69124
 DIST hydrus-488.tar.gz 40428970 BLAKE2B 7a6252276cf60ab4969591d6cf44bf13eec167b432ed0cd5c0ced96f32363640aa246db1256e20e452fe1a6521011c2d46100c3148c0d3241cb810fcde47ad1b SHA512 cbb6a2d1794c5de4c5495a61f115722b1bbad79f3458315586c383eaff79a1f0c144c4498a7c8f651b8ce5592c22ffcc61496a3637471d9ffdeffaef500cd998
 DIST hydrus-490.tar.gz 40610222 BLAKE2B 7a6b8fbab2ae64baeeaaa7f0a89a69f5e54719d42b473e7bccd2e549f5d6bc7005831803bd6966af04f4a69d48cf0139a63a2ec17cf34c1190bfb47e422bc821 SHA512 619349d383114774303b6ca5a9239d9d7adfd43db2fde22c17322c630c27b747953932f3d9622b64727714afcb3c70c2b3b065afb75f83dc95ec84eb0c0976ba
 DIST hydrus-493.tar.gz 40623287 BLAKE2B 16d5a4a280fe8f0c80bb3a59596ebe72681a5cb88942f3d02985d338b3a92e3d602983b2b2d294aebe3af98672914e866c33206cc7db3511313e5d5aa994386d SHA512 b0d1d2266ca1d18281144585fc71362d2998eda6fb93363c9309b5f2428484f9a74bbc1102659db6e184239a099ad364182ba0560be72c649181a0ac81f83abd
+DIST hydrus-495.tar.gz 40638581 BLAKE2B 73a6b0101ec58fa32b421fdb625907e10dae006e902ffa338c952f2daefa42f8a2bb90b42a3bfeec0a351340963c7e6f0ca68e06a6dcc5eff3893f884123ddeb SHA512 5cf69bbc153d3f6a8159a58a6ba798ec03f235bd02c50f10749592e67102dc26b1781a84bd38881fd34809848a1cf7d37e1feeeb4b53fa76976c13a6cbce484e

diff --git a/media-gfx/hydrus/hydrus-484.ebuild b/media-gfx/hydrus/hydrus-495.ebuild
similarity index 100%
rename from media-gfx/hydrus/hydrus-484.ebuild
rename to media-gfx/hydrus/hydrus-495.ebuild


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2022-08-27 11:47 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2022-08-27 11:47 UTC (permalink / raw
  To: gentoo-commits

commit:     38aee442f95cf345d582187a638124e6b92eab2d
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Thu Aug 25 07:59:03 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Aug 27 11:47:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38aee442

media-gfx/hydrus: Drop 490, add 497

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://github.com/gentoo/gentoo/pull/26892
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/Manifest                                 | 2 +-
 media-gfx/hydrus/{hydrus-490.ebuild => hydrus-497.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 81d3ecf870a4..511998e10e4d 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,4 +1,4 @@
-DIST hydrus-490.tar.gz 40610222 BLAKE2B 7a6b8fbab2ae64baeeaaa7f0a89a69f5e54719d42b473e7bccd2e549f5d6bc7005831803bd6966af04f4a69d48cf0139a63a2ec17cf34c1190bfb47e422bc821 SHA512 619349d383114774303b6ca5a9239d9d7adfd43db2fde22c17322c630c27b747953932f3d9622b64727714afcb3c70c2b3b065afb75f83dc95ec84eb0c0976ba
 DIST hydrus-493.tar.gz 40623287 BLAKE2B 16d5a4a280fe8f0c80bb3a59596ebe72681a5cb88942f3d02985d338b3a92e3d602983b2b2d294aebe3af98672914e866c33206cc7db3511313e5d5aa994386d SHA512 b0d1d2266ca1d18281144585fc71362d2998eda6fb93363c9309b5f2428484f9a74bbc1102659db6e184239a099ad364182ba0560be72c649181a0ac81f83abd
 DIST hydrus-495.tar.gz 40638581 BLAKE2B 73a6b0101ec58fa32b421fdb625907e10dae006e902ffa338c952f2daefa42f8a2bb90b42a3bfeec0a351340963c7e6f0ca68e06a6dcc5eff3893f884123ddeb SHA512 5cf69bbc153d3f6a8159a58a6ba798ec03f235bd02c50f10749592e67102dc26b1781a84bd38881fd34809848a1cf7d37e1feeeb4b53fa76976c13a6cbce484e
 DIST hydrus-496.tar.gz 40644118 BLAKE2B 8acb369acb3bbe667d51eeb3de8cceef02585040ae63d50fbbff4b5e8d8f4bac29dc4cd08c9eb8f436a1fc7150bb7eb249ff3f5d13e5a4ee54a2dee877f00208 SHA512 5cc7e4f4f152790659014d675159e121aa65e275231ef43bc3bbd6efe67b458cd821d8858d94e440a1585e0040b242c5ef65368796705242e7eb8e51c62b81bf
+DIST hydrus-497.tar.gz 40649206 BLAKE2B e014ff318275547ec210aa13bba1377de726b80ee1389b593ab219fc4530a44766b29111444fbc08cf50b4ca61f6129683adeb0f3835afa3cfba729e9af285b1 SHA512 39fb3e3ef3bf024913a168f616fa436013f1d2b92be102b3dfead35219420791c11b3c1846ddae577a6ee4ae3aeb9601f11d1e7ce8daac99932f14699a497242

diff --git a/media-gfx/hydrus/hydrus-490.ebuild b/media-gfx/hydrus/hydrus-497.ebuild
similarity index 100%
rename from media-gfx/hydrus/hydrus-490.ebuild
rename to media-gfx/hydrus/hydrus-497.ebuild


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2022-11-02 14:24 Joonas Niilola
  0 siblings, 0 replies; 104+ messages in thread
From: Joonas Niilola @ 2022-11-02 14:24 UTC (permalink / raw
  To: gentoo-commits

commit:     285432835fcff694f2cecbe9ac6fae4729faaf35
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Thu Oct 13 18:18:03 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Nov  2 14:24:26 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28543283

media-gfx/hydrus: Add 501, drop 493

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://github.com/gentoo/gentoo/pull/27773
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/hydrus/Manifest                                 | 2 +-
 media-gfx/hydrus/{hydrus-493.ebuild => hydrus-501.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 511998e10e4d..d6a1cc7db3b5 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,4 +1,4 @@
-DIST hydrus-493.tar.gz 40623287 BLAKE2B 16d5a4a280fe8f0c80bb3a59596ebe72681a5cb88942f3d02985d338b3a92e3d602983b2b2d294aebe3af98672914e866c33206cc7db3511313e5d5aa994386d SHA512 b0d1d2266ca1d18281144585fc71362d2998eda6fb93363c9309b5f2428484f9a74bbc1102659db6e184239a099ad364182ba0560be72c649181a0ac81f83abd
 DIST hydrus-495.tar.gz 40638581 BLAKE2B 73a6b0101ec58fa32b421fdb625907e10dae006e902ffa338c952f2daefa42f8a2bb90b42a3bfeec0a351340963c7e6f0ca68e06a6dcc5eff3893f884123ddeb SHA512 5cf69bbc153d3f6a8159a58a6ba798ec03f235bd02c50f10749592e67102dc26b1781a84bd38881fd34809848a1cf7d37e1feeeb4b53fa76976c13a6cbce484e
 DIST hydrus-496.tar.gz 40644118 BLAKE2B 8acb369acb3bbe667d51eeb3de8cceef02585040ae63d50fbbff4b5e8d8f4bac29dc4cd08c9eb8f436a1fc7150bb7eb249ff3f5d13e5a4ee54a2dee877f00208 SHA512 5cc7e4f4f152790659014d675159e121aa65e275231ef43bc3bbd6efe67b458cd821d8858d94e440a1585e0040b242c5ef65368796705242e7eb8e51c62b81bf
 DIST hydrus-497.tar.gz 40649206 BLAKE2B e014ff318275547ec210aa13bba1377de726b80ee1389b593ab219fc4530a44766b29111444fbc08cf50b4ca61f6129683adeb0f3835afa3cfba729e9af285b1 SHA512 39fb3e3ef3bf024913a168f616fa436013f1d2b92be102b3dfead35219420791c11b3c1846ddae577a6ee4ae3aeb9601f11d1e7ce8daac99932f14699a497242
+DIST hydrus-501.tar.gz 40724774 BLAKE2B 6a93c4483b07e976fac829aee4c1f4c879f535ff0ce7e89c64b278bc3f7d77abdd9b906d48f87b175a1eccec2dcf962725abe0602fb68b009fbba9d0f3381067 SHA512 1c9275023f1d205bf916eb85566237fe8f25a446399065ebc371e1db8ca3c3e2501e8a82867e9f7711b007a74a9e88d838babca29a2556d19ffcf77b14182834

diff --git a/media-gfx/hydrus/hydrus-493.ebuild b/media-gfx/hydrus/hydrus-501.ebuild
similarity index 100%
rename from media-gfx/hydrus/hydrus-493.ebuild
rename to media-gfx/hydrus/hydrus-501.ebuild


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2022-11-07 19:30 Ionen Wolkens
  0 siblings, 0 replies; 104+ messages in thread
From: Ionen Wolkens @ 2022-11-07 19:30 UTC (permalink / raw
  To: gentoo-commits

commit:     88782d8b2da793d412d3ae396ecf287414335735
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  6 14:38:32 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Nov  7 19:27:57 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88782d8b

media-gfx/hydrus: remove direct dependency on media-video/mpv

mpv itself does not provide python bindings and using PYTHON_USEDEP
on it is meaningless and will cause issues now that mpv is migrating
to python-single-r1 (only used for 1 /usr/bin script).

As far as I can tell this package does not use mpv directly and
always goes through python-mpv, so let it handle pulling libmpv.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 media-gfx/hydrus/{hydrus-495.ebuild => hydrus-495-r1.ebuild} | 1 -
 media-gfx/hydrus/{hydrus-496.ebuild => hydrus-496-r1.ebuild} | 1 -
 media-gfx/hydrus/{hydrus-497.ebuild => hydrus-497-r1.ebuild} | 1 -
 media-gfx/hydrus/{hydrus-501.ebuild => hydrus-501-r1.ebuild} | 1 -
 media-gfx/hydrus/hydrus-9999.ebuild                          | 1 -
 5 files changed, 5 deletions(-)

diff --git a/media-gfx/hydrus/hydrus-495.ebuild b/media-gfx/hydrus/hydrus-495-r1.ebuild
similarity index 99%
rename from media-gfx/hydrus/hydrus-495.ebuild
rename to media-gfx/hydrus/hydrus-495-r1.ebuild
index 86568b05547c..1ecb76ea0b7b 100644
--- a/media-gfx/hydrus/hydrus-495.ebuild
+++ b/media-gfx/hydrus/hydrus-495-r1.ebuild
@@ -58,7 +58,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}]

diff --git a/media-gfx/hydrus/hydrus-496.ebuild b/media-gfx/hydrus/hydrus-496-r1.ebuild
similarity index 99%
rename from media-gfx/hydrus/hydrus-496.ebuild
rename to media-gfx/hydrus/hydrus-496-r1.ebuild
index 86568b05547c..1ecb76ea0b7b 100644
--- a/media-gfx/hydrus/hydrus-496.ebuild
+++ b/media-gfx/hydrus/hydrus-496-r1.ebuild
@@ -58,7 +58,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}]

diff --git a/media-gfx/hydrus/hydrus-497.ebuild b/media-gfx/hydrus/hydrus-497-r1.ebuild
similarity index 99%
rename from media-gfx/hydrus/hydrus-497.ebuild
rename to media-gfx/hydrus/hydrus-497-r1.ebuild
index 86568b05547c..1ecb76ea0b7b 100644
--- a/media-gfx/hydrus/hydrus-497.ebuild
+++ b/media-gfx/hydrus/hydrus-497-r1.ebuild
@@ -58,7 +58,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}]

diff --git a/media-gfx/hydrus/hydrus-501.ebuild b/media-gfx/hydrus/hydrus-501-r1.ebuild
similarity index 99%
rename from media-gfx/hydrus/hydrus-501.ebuild
rename to media-gfx/hydrus/hydrus-501-r1.ebuild
index 86568b05547c..1ecb76ea0b7b 100644
--- a/media-gfx/hydrus/hydrus-501.ebuild
+++ b/media-gfx/hydrus/hydrus-501-r1.ebuild
@@ -58,7 +58,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}]

diff --git a/media-gfx/hydrus/hydrus-9999.ebuild b/media-gfx/hydrus/hydrus-9999.ebuild
index 86568b05547c..1ecb76ea0b7b 100644
--- a/media-gfx/hydrus/hydrus-9999.ebuild
+++ b/media-gfx/hydrus/hydrus-9999.ebuild
@@ -58,7 +58,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}]


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2022-12-03  8:53 Joonas Niilola
  0 siblings, 0 replies; 104+ messages in thread
From: Joonas Niilola @ 2022-12-03  8:53 UTC (permalink / raw
  To: gentoo-commits

commit:     a948d0a84656785426d11f076efc940172e7a26a
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  3 08:44:52 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Dec  3 08:53:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a948d0a8

media-gfx/hydrus: update EAPI 7 -> 8

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/hydrus/hydrus-505.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/hydrus/hydrus-505.ebuild b/media-gfx/hydrus/hydrus-505.ebuild
index 86568b05547c..ca93c8125f9a 100644
--- a/media-gfx/hydrus/hydrus-505.ebuild
+++ b/media-gfx/hydrus/hydrus-505.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite"


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2022-12-03  8:53 Joonas Niilola
  0 siblings, 0 replies; 104+ messages in thread
From: Joonas Niilola @ 2022-12-03  8:53 UTC (permalink / raw
  To: gentoo-commits

commit:     624e464d880753cbe8ed7e4ce3c414ebffddafaf
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Tue Nov 15 19:09:58 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Dec  3 08:53:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=624e464d

media-gfx/hydrus: Drop 495

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/hydrus/Manifest             |   1 -
 media-gfx/hydrus/hydrus-495-r1.ebuild | 146 ----------------------------------
 2 files changed, 147 deletions(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 207682d17443..8f0ecdd4927a 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,4 +1,3 @@
-DIST hydrus-495.tar.gz 40638581 BLAKE2B 73a6b0101ec58fa32b421fdb625907e10dae006e902ffa338c952f2daefa42f8a2bb90b42a3bfeec0a351340963c7e6f0ca68e06a6dcc5eff3893f884123ddeb SHA512 5cf69bbc153d3f6a8159a58a6ba798ec03f235bd02c50f10749592e67102dc26b1781a84bd38881fd34809848a1cf7d37e1feeeb4b53fa76976c13a6cbce484e
 DIST hydrus-496.tar.gz 40644118 BLAKE2B 8acb369acb3bbe667d51eeb3de8cceef02585040ae63d50fbbff4b5e8d8f4bac29dc4cd08c9eb8f436a1fc7150bb7eb249ff3f5d13e5a4ee54a2dee877f00208 SHA512 5cc7e4f4f152790659014d675159e121aa65e275231ef43bc3bbd6efe67b458cd821d8858d94e440a1585e0040b242c5ef65368796705242e7eb8e51c62b81bf
 DIST hydrus-497.tar.gz 40649206 BLAKE2B e014ff318275547ec210aa13bba1377de726b80ee1389b593ab219fc4530a44766b29111444fbc08cf50b4ca61f6129683adeb0f3835afa3cfba729e9af285b1 SHA512 39fb3e3ef3bf024913a168f616fa436013f1d2b92be102b3dfead35219420791c11b3c1846ddae577a6ee4ae3aeb9601f11d1e7ce8daac99932f14699a497242
 DIST hydrus-501.tar.gz 40724774 BLAKE2B 6a93c4483b07e976fac829aee4c1f4c879f535ff0ce7e89c64b278bc3f7d77abdd9b906d48f87b175a1eccec2dcf962725abe0602fb68b009fbba9d0f3381067 SHA512 1c9275023f1d205bf916eb85566237fe8f25a446399065ebc371e1db8ca3c3e2501e8a82867e9f7711b007a74a9e88d838babca29a2556d19ffcf77b14182834

diff --git a/media-gfx/hydrus/hydrus-495-r1.ebuild b/media-gfx/hydrus/hydrus-495-r1.ebuild
deleted file mode 100644
index 1ecb76ea0b7b..000000000000
--- a/media-gfx/hydrus/hydrus-495-r1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite"
-
-DOCS_BUILDER=mkdocs
-DOCS_DEPEND="dev-python/mkdocs-material"
-
-inherit python-single-r1 desktop docs optfeature
-
-DESCRIPTION="A booru-like media organizer for the desktop"
-HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
-else
-	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-	KEYWORDS="~amd64"
-fi
-
-# hydrus itself is WTFPL
-# icons included are CC-BY-2.5
-LICENSE="WTFPL-2 CC-BY-2.5"
-SLOT="0"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-# RDEPEND is sorted as such:
-# - No specific requirements
-# - Specific version or slot
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/cbor2[${PYTHON_USEDEP}]
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cloudscraper[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},lcms]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
-		dev-python/python-mpv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/twisted[${PYTHON_USEDEP}]
-		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
-		media-video/ffmpeg
-
-		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	')
-"
-BDEPEND="
-	${RDEPEND}
-	$(python_gen_cond_dep '
-		test? (
-			dev-python/httmock[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/nose[${PYTHON_USEDEP}]
-		)
-	')
-"
-
-PATCHES=(
-	"${FILESDIR}/userpath-in-local-share.patch"
-)
-
-src_prepare() {
-	default
-
-	# Contains pre-built binaries for other systems and a broken swf renderer for linux
-	rm -r bin/ || die
-	# Build files used for CI, not actually needed
-	rm -r static/build_files || die
-	# Python requirements files, not needed
-	rm requirements_*.txt || die
-}
-
-src_compile() {
-	python_optimize "${S}"
-	docs_compile
-}
-
-src_test() {
-	# The tests use unittest, but are run with a custom runner script.
-	# QT_QPA_PLATFORM is required to make them run without X
-	local -x QT_QPA_PLATFORM=offscreen
-	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
-}
-
-src_install() {
-	local doc="${EPREFIX}/usr/share/doc/${PF}"
-	elog "Hydrus includes an excellent manual, that can either be viewed at"
-	elog "${doc}/html/help/index.html"
-	elog "or accessed through the hydrus help menu."
-
-	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
-
-	local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/)
-	einstalldocs
-
-	# Files only needed for testing
-	rm test.py hydrus/hydrus_test.py || die
-	rm -r hydrus/test/ static/testing/ || die
-
-	# ${DOCS[@]} files are copied into doc
-	# ${S}/docs/ is the markdown source code for documentation
-	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
-	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
-	if use doc; then
-		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
-		rm -r "${S}/_build" || die
-		# The program expects to find documentation here, so add a symlink to doc
-		dosym "${doc}/html" /opt/hydrus/help
-	fi
-
-	insinto /opt/hydrus
-	doins -r "${S}"/.
-
-	exeinto /usr/bin
-	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
-	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
-
-	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
-					   "AudioVideo;FileTools;Graphics;Network;"
-}
-
-pkg_postinst() {
-	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
-	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
-	optfeature "memory compression in the client" "dev-python/lz4"
-	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
-}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2022-12-03  8:53 Joonas Niilola
  0 siblings, 0 replies; 104+ messages in thread
From: Joonas Niilola @ 2022-12-03  8:53 UTC (permalink / raw
  To: gentoo-commits

commit:     3d44e076410026b2ddf8e4ecfdec388875676332
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Tue Nov 15 19:09:46 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Dec  3 08:53:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d44e076

media-gfx/hydrus: Add 505

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/hydrus/Manifest          |   1 +
 media-gfx/hydrus/hydrus-505.ebuild | 147 +++++++++++++++++++++++++++++++++++++
 2 files changed, 148 insertions(+)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index d6a1cc7db3b5..207682d17443 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -2,3 +2,4 @@ DIST hydrus-495.tar.gz 40638581 BLAKE2B 73a6b0101ec58fa32b421fdb625907e10dae006e
 DIST hydrus-496.tar.gz 40644118 BLAKE2B 8acb369acb3bbe667d51eeb3de8cceef02585040ae63d50fbbff4b5e8d8f4bac29dc4cd08c9eb8f436a1fc7150bb7eb249ff3f5d13e5a4ee54a2dee877f00208 SHA512 5cc7e4f4f152790659014d675159e121aa65e275231ef43bc3bbd6efe67b458cd821d8858d94e440a1585e0040b242c5ef65368796705242e7eb8e51c62b81bf
 DIST hydrus-497.tar.gz 40649206 BLAKE2B e014ff318275547ec210aa13bba1377de726b80ee1389b593ab219fc4530a44766b29111444fbc08cf50b4ca61f6129683adeb0f3835afa3cfba729e9af285b1 SHA512 39fb3e3ef3bf024913a168f616fa436013f1d2b92be102b3dfead35219420791c11b3c1846ddae577a6ee4ae3aeb9601f11d1e7ce8daac99932f14699a497242
 DIST hydrus-501.tar.gz 40724774 BLAKE2B 6a93c4483b07e976fac829aee4c1f4c879f535ff0ce7e89c64b278bc3f7d77abdd9b906d48f87b175a1eccec2dcf962725abe0602fb68b009fbba9d0f3381067 SHA512 1c9275023f1d205bf916eb85566237fe8f25a446399065ebc371e1db8ca3c3e2501e8a82867e9f7711b007a74a9e88d838babca29a2556d19ffcf77b14182834
+DIST hydrus-505.tar.gz 40756022 BLAKE2B a5d9cfd5f8023a2f809c2610c48e8018ca7bb6002d1420485e463b3fe477cae07a2f4ea2cd823ff592a164d37e611938fe805d163cbf5512c636b972c1afad77 SHA512 f5c818616aa195b904d5cd65e77f29095f22fc9f435b0218110cb47e655c004c3ce3e72fc9de8ec8b1e9b508ced42b045131e0ddd6442fa43fc7d4d77877465e

diff --git a/media-gfx/hydrus/hydrus-505.ebuild b/media-gfx/hydrus/hydrus-505.ebuild
new file mode 100644
index 000000000000..86568b05547c
--- /dev/null
+++ b/media-gfx/hydrus/hydrus-505.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="sqlite"
+
+DOCS_BUILDER=mkdocs
+DOCS_DEPEND="dev-python/mkdocs-material"
+
+inherit python-single-r1 desktop docs optfeature
+
+DESCRIPTION="A booru-like media organizer for the desktop"
+HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
+else
+	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+# hydrus itself is WTFPL
+# icons included are CC-BY-2.5
+LICENSE="WTFPL-2 CC-BY-2.5"
+SLOT="0"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+# RDEPEND is sorted as such:
+# - No specific requirements
+# - Specific version or slot
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/cbor2[${PYTHON_USEDEP}]
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cloudscraper[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},lcms]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
+		dev-python/python-mpv[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		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}]
+	')
+"
+BDEPEND="
+	${RDEPEND}
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/httmock[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/nose[${PYTHON_USEDEP}]
+		)
+	')
+"
+
+PATCHES=(
+	"${FILESDIR}/userpath-in-local-share.patch"
+)
+
+src_prepare() {
+	default
+
+	# Contains pre-built binaries for other systems and a broken swf renderer for linux
+	rm -r bin/ || die
+	# Build files used for CI, not actually needed
+	rm -r static/build_files || die
+	# Python requirements files, not needed
+	rm requirements_*.txt || die
+}
+
+src_compile() {
+	python_optimize "${S}"
+	docs_compile
+}
+
+src_test() {
+	# The tests use unittest, but are run with a custom runner script.
+	# QT_QPA_PLATFORM is required to make them run without X
+	local -x QT_QPA_PLATFORM=offscreen
+	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
+}
+
+src_install() {
+	local doc="${EPREFIX}/usr/share/doc/${PF}"
+	elog "Hydrus includes an excellent manual, that can either be viewed at"
+	elog "${doc}/html/help/index.html"
+	elog "or accessed through the hydrus help menu."
+
+	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
+
+	local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/)
+	einstalldocs
+
+	# Files only needed for testing
+	rm test.py hydrus/hydrus_test.py || die
+	rm -r hydrus/test/ static/testing/ || die
+
+	# ${DOCS[@]} files are copied into doc
+	# ${S}/docs/ is the markdown source code for documentation
+	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
+	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
+	if use doc; then
+		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
+		rm -r "${S}/_build" || die
+		# The program expects to find documentation here, so add a symlink to doc
+		dosym "${doc}/html" /opt/hydrus/help
+	fi
+
+	insinto /opt/hydrus
+	doins -r "${S}"/.
+
+	exeinto /usr/bin
+	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
+	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
+
+	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
+					   "AudioVideo;FileTools;Graphics;Network;"
+}
+
+pkg_postinst() {
+	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
+	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
+	optfeature "memory compression in the client" "dev-python/lz4"
+	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
+}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2023-01-07 16:49 Joonas Niilola
  0 siblings, 0 replies; 104+ messages in thread
From: Joonas Niilola @ 2023-01-07 16:49 UTC (permalink / raw
  To: gentoo-commits

commit:     a9a7881f0a9c46915516c343fbc60a649297d72c
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  7 16:45:42 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Jan  7 16:48:29 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9a7881f

media-gfx/hydrus: drop 501-r1, 505

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/hydrus/Manifest             |   2 -
 media-gfx/hydrus/hydrus-501-r1.ebuild | 145 ---------------------------------
 media-gfx/hydrus/hydrus-505.ebuild    | 146 ----------------------------------
 3 files changed, 293 deletions(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index b50e50de9f36..948601b469ec 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,4 +1,2 @@
-DIST hydrus-501.tar.gz 40724774 BLAKE2B 6a93c4483b07e976fac829aee4c1f4c879f535ff0ce7e89c64b278bc3f7d77abdd9b906d48f87b175a1eccec2dcf962725abe0602fb68b009fbba9d0f3381067 SHA512 1c9275023f1d205bf916eb85566237fe8f25a446399065ebc371e1db8ca3c3e2501e8a82867e9f7711b007a74a9e88d838babca29a2556d19ffcf77b14182834
-DIST hydrus-505.tar.gz 40756022 BLAKE2B a5d9cfd5f8023a2f809c2610c48e8018ca7bb6002d1420485e463b3fe477cae07a2f4ea2cd823ff592a164d37e611938fe805d163cbf5512c636b972c1afad77 SHA512 f5c818616aa195b904d5cd65e77f29095f22fc9f435b0218110cb47e655c004c3ce3e72fc9de8ec8b1e9b508ced42b045131e0ddd6442fa43fc7d4d77877465e
 DIST hydrus-510.tar.gz 40813887 BLAKE2B 84ecc40897e0aa324005d05146ea1ac439e9576a376ab40641a948ddeb2a58b7f171a0b9c00f69bd34b218e195c8b77c505992c0b51372454bc3c8208f1ef485 SHA512 998cdd09bcbb8bf3ba611754f5237d5a743e89988bf3259ae7187ac8730e6183b433622c25fef400c0efdc9fd38dcbfa171e70da5be953557983d08f15c8b21e
 DIST hydrus-511.tar.gz 40821597 BLAKE2B 15bff5bf7427ddef3a3700a883d0afe83090844c2052c41b1c4bfc13bce1f0052d48cc452d7e779c8b42a9a0d68901d27e750673ca2414c209db1c1fcd67a427 SHA512 d48d8e31b4eab80db917ebe6fe5ece719644e1b06ec8ca063a20044b39ad695b90c00340850be42c69ee163ab8866c0925c90752c74fdfbf40643dc02658b813

diff --git a/media-gfx/hydrus/hydrus-501-r1.ebuild b/media-gfx/hydrus/hydrus-501-r1.ebuild
deleted file mode 100644
index e9bc433e54ac..000000000000
--- a/media-gfx/hydrus/hydrus-501-r1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite"
-
-DOCS_BUILDER=mkdocs
-DOCS_DEPEND="dev-python/mkdocs-material"
-
-inherit python-single-r1 desktop docs optfeature
-
-DESCRIPTION="A booru-like media organizer for the desktop"
-HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
-else
-	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-	KEYWORDS="~amd64"
-fi
-
-# hydrus itself is WTFPL
-# icons included are CC-BY-2.5
-LICENSE="WTFPL-2 CC-BY-2.5"
-SLOT="0"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-# RDEPEND is sorted as such:
-# - No specific requirements
-# - Specific version or slot
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/cbor2[${PYTHON_USEDEP}]
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cloudscraper[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},lcms]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
-		dev-python/python-mpv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/twisted[${PYTHON_USEDEP}]
-		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
-		media-video/ffmpeg
-
-		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	')
-"
-BDEPEND="
-	${RDEPEND}
-	$(python_gen_cond_dep '
-		test? (
-			dev-python/httmock[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-		)
-	')
-"
-
-PATCHES=(
-	"${FILESDIR}/userpath-in-local-share.patch"
-)
-
-src_prepare() {
-	default
-
-	# Contains pre-built binaries for other systems and a broken swf renderer for linux
-	rm -r bin/ || die
-	# Build files used for CI, not actually needed
-	rm -r static/build_files || die
-	# Python requirements files, not needed
-	rm requirements_*.txt || die
-}
-
-src_compile() {
-	python_optimize "${S}"
-	docs_compile
-}
-
-src_test() {
-	# The tests use unittest, but are run with a custom runner script.
-	# QT_QPA_PLATFORM is required to make them run without X
-	local -x QT_QPA_PLATFORM=offscreen
-	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
-}
-
-src_install() {
-	local doc="${EPREFIX}/usr/share/doc/${PF}"
-	elog "Hydrus includes an excellent manual, that can either be viewed at"
-	elog "${doc}/html/help/index.html"
-	elog "or accessed through the hydrus help menu."
-
-	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
-
-	local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/)
-	einstalldocs
-
-	# Files only needed for testing
-	rm test.py hydrus/hydrus_test.py || die
-	rm -r hydrus/test/ static/testing/ || die
-
-	# ${DOCS[@]} files are copied into doc
-	# ${S}/docs/ is the markdown source code for documentation
-	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
-	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
-	if use doc; then
-		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
-		rm -r "${S}/_build" || die
-		# The program expects to find documentation here, so add a symlink to doc
-		dosym "${doc}/html" /opt/hydrus/help
-	fi
-
-	insinto /opt/hydrus
-	doins -r "${S}"/.
-
-	exeinto /usr/bin
-	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
-	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
-
-	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
-					   "AudioVideo;FileTools;Graphics;Network;"
-}
-
-pkg_postinst() {
-	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
-	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
-	optfeature "memory compression in the client" "dev-python/lz4"
-	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
-}

diff --git a/media-gfx/hydrus/hydrus-505.ebuild b/media-gfx/hydrus/hydrus-505.ebuild
deleted file mode 100644
index 9c9ecc644646..000000000000
--- a/media-gfx/hydrus/hydrus-505.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite"
-
-DOCS_BUILDER=mkdocs
-DOCS_DEPEND="dev-python/mkdocs-material"
-
-inherit python-single-r1 desktop docs optfeature
-
-DESCRIPTION="A booru-like media organizer for the desktop"
-HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
-else
-	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-	KEYWORDS="~amd64"
-fi
-
-# hydrus itself is WTFPL
-# icons included are CC-BY-2.5
-LICENSE="WTFPL-2 CC-BY-2.5"
-SLOT="0"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-# RDEPEND is sorted as such:
-# - No specific requirements
-# - Specific version or slot
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/cbor2[${PYTHON_USEDEP}]
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cloudscraper[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},lcms]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
-		dev-python/python-mpv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		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}]
-	')
-"
-BDEPEND="
-	${RDEPEND}
-	$(python_gen_cond_dep '
-		test? (
-			dev-python/httmock[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-		)
-	')
-"
-
-PATCHES=(
-	"${FILESDIR}/userpath-in-local-share.patch"
-)
-
-src_prepare() {
-	default
-
-	# Contains pre-built binaries for other systems and a broken swf renderer for linux
-	rm -r bin/ || die
-	# Build files used for CI, not actually needed
-	rm -r static/build_files || die
-	# Python requirements files, not needed
-	rm requirements_*.txt || die
-}
-
-src_compile() {
-	python_optimize "${S}"
-	docs_compile
-}
-
-src_test() {
-	# The tests use unittest, but are run with a custom runner script.
-	# QT_QPA_PLATFORM is required to make them run without X
-	local -x QT_QPA_PLATFORM=offscreen
-	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
-}
-
-src_install() {
-	local doc="${EPREFIX}/usr/share/doc/${PF}"
-	elog "Hydrus includes an excellent manual, that can either be viewed at"
-	elog "${doc}/html/help/index.html"
-	elog "or accessed through the hydrus help menu."
-
-	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
-
-	local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/)
-	einstalldocs
-
-	# Files only needed for testing
-	rm test.py hydrus/hydrus_test.py || die
-	rm -r hydrus/test/ static/testing/ || die
-
-	# ${DOCS[@]} files are copied into doc
-	# ${S}/docs/ is the markdown source code for documentation
-	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
-	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
-	if use doc; then
-		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
-		rm -r "${S}/_build" || die
-		# The program expects to find documentation here, so add a symlink to doc
-		dosym "${doc}/html" /opt/hydrus/help
-	fi
-
-	insinto /opt/hydrus
-	doins -r "${S}"/.
-
-	exeinto /usr/bin
-	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
-	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
-
-	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
-					   "AudioVideo;FileTools;Graphics;Network;"
-}
-
-pkg_postinst() {
-	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
-	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
-	optfeature "memory compression in the client" "dev-python/lz4"
-	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
-}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2023-01-07 16:49 Joonas Niilola
  0 siblings, 0 replies; 104+ messages in thread
From: Joonas Niilola @ 2023-01-07 16:49 UTC (permalink / raw
  To: gentoo-commits

commit:     a0d498d58bf3ddd2fcb43db2eebdd36e242e154b
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Sun Dec 18 11:44:55 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Jan  7 16:43:24 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0d498d5

media-gfx/hydrus: Drop 496-r1

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/hydrus/Manifest             |   1 -
 media-gfx/hydrus/hydrus-496-r1.ebuild | 146 ----------------------------------
 2 files changed, 147 deletions(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 8f0ecdd4927a..d159c2b24a8b 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,4 +1,3 @@
-DIST hydrus-496.tar.gz 40644118 BLAKE2B 8acb369acb3bbe667d51eeb3de8cceef02585040ae63d50fbbff4b5e8d8f4bac29dc4cd08c9eb8f436a1fc7150bb7eb249ff3f5d13e5a4ee54a2dee877f00208 SHA512 5cc7e4f4f152790659014d675159e121aa65e275231ef43bc3bbd6efe67b458cd821d8858d94e440a1585e0040b242c5ef65368796705242e7eb8e51c62b81bf
 DIST hydrus-497.tar.gz 40649206 BLAKE2B e014ff318275547ec210aa13bba1377de726b80ee1389b593ab219fc4530a44766b29111444fbc08cf50b4ca61f6129683adeb0f3835afa3cfba729e9af285b1 SHA512 39fb3e3ef3bf024913a168f616fa436013f1d2b92be102b3dfead35219420791c11b3c1846ddae577a6ee4ae3aeb9601f11d1e7ce8daac99932f14699a497242
 DIST hydrus-501.tar.gz 40724774 BLAKE2B 6a93c4483b07e976fac829aee4c1f4c879f535ff0ce7e89c64b278bc3f7d77abdd9b906d48f87b175a1eccec2dcf962725abe0602fb68b009fbba9d0f3381067 SHA512 1c9275023f1d205bf916eb85566237fe8f25a446399065ebc371e1db8ca3c3e2501e8a82867e9f7711b007a74a9e88d838babca29a2556d19ffcf77b14182834
 DIST hydrus-505.tar.gz 40756022 BLAKE2B a5d9cfd5f8023a2f809c2610c48e8018ca7bb6002d1420485e463b3fe477cae07a2f4ea2cd823ff592a164d37e611938fe805d163cbf5512c636b972c1afad77 SHA512 f5c818616aa195b904d5cd65e77f29095f22fc9f435b0218110cb47e655c004c3ce3e72fc9de8ec8b1e9b508ced42b045131e0ddd6442fa43fc7d4d77877465e

diff --git a/media-gfx/hydrus/hydrus-496-r1.ebuild b/media-gfx/hydrus/hydrus-496-r1.ebuild
deleted file mode 100644
index 1ecb76ea0b7b..000000000000
--- a/media-gfx/hydrus/hydrus-496-r1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite"
-
-DOCS_BUILDER=mkdocs
-DOCS_DEPEND="dev-python/mkdocs-material"
-
-inherit python-single-r1 desktop docs optfeature
-
-DESCRIPTION="A booru-like media organizer for the desktop"
-HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
-else
-	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-	KEYWORDS="~amd64"
-fi
-
-# hydrus itself is WTFPL
-# icons included are CC-BY-2.5
-LICENSE="WTFPL-2 CC-BY-2.5"
-SLOT="0"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-# RDEPEND is sorted as such:
-# - No specific requirements
-# - Specific version or slot
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/cbor2[${PYTHON_USEDEP}]
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cloudscraper[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},lcms]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
-		dev-python/python-mpv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/twisted[${PYTHON_USEDEP}]
-		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
-		media-video/ffmpeg
-
-		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	')
-"
-BDEPEND="
-	${RDEPEND}
-	$(python_gen_cond_dep '
-		test? (
-			dev-python/httmock[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/nose[${PYTHON_USEDEP}]
-		)
-	')
-"
-
-PATCHES=(
-	"${FILESDIR}/userpath-in-local-share.patch"
-)
-
-src_prepare() {
-	default
-
-	# Contains pre-built binaries for other systems and a broken swf renderer for linux
-	rm -r bin/ || die
-	# Build files used for CI, not actually needed
-	rm -r static/build_files || die
-	# Python requirements files, not needed
-	rm requirements_*.txt || die
-}
-
-src_compile() {
-	python_optimize "${S}"
-	docs_compile
-}
-
-src_test() {
-	# The tests use unittest, but are run with a custom runner script.
-	# QT_QPA_PLATFORM is required to make them run without X
-	local -x QT_QPA_PLATFORM=offscreen
-	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
-}
-
-src_install() {
-	local doc="${EPREFIX}/usr/share/doc/${PF}"
-	elog "Hydrus includes an excellent manual, that can either be viewed at"
-	elog "${doc}/html/help/index.html"
-	elog "or accessed through the hydrus help menu."
-
-	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
-
-	local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/)
-	einstalldocs
-
-	# Files only needed for testing
-	rm test.py hydrus/hydrus_test.py || die
-	rm -r hydrus/test/ static/testing/ || die
-
-	# ${DOCS[@]} files are copied into doc
-	# ${S}/docs/ is the markdown source code for documentation
-	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
-	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
-	if use doc; then
-		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
-		rm -r "${S}/_build" || die
-		# The program expects to find documentation here, so add a symlink to doc
-		dosym "${doc}/html" /opt/hydrus/help
-	fi
-
-	insinto /opt/hydrus
-	doins -r "${S}"/.
-
-	exeinto /usr/bin
-	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
-	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
-
-	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
-					   "AudioVideo;FileTools;Graphics;Network;"
-}
-
-pkg_postinst() {
-	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
-	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
-	optfeature "memory compression in the client" "dev-python/lz4"
-	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
-}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2023-01-07 16:49 Joonas Niilola
  0 siblings, 0 replies; 104+ messages in thread
From: Joonas Niilola @ 2023-01-07 16:49 UTC (permalink / raw
  To: gentoo-commits

commit:     6e182313fc7c6f230d1321927af6441114a12a7d
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Thu Dec 22 14:56:59 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Jan  7 16:43:29 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e182313

media-gfx/hydrus: Drop 497-r1

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/hydrus/Manifest             |   1 -
 media-gfx/hydrus/hydrus-497-r1.ebuild | 146 ----------------------------------
 2 files changed, 147 deletions(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 367ad71e3567..b97158a2b5ff 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,4 +1,3 @@
-DIST hydrus-497.tar.gz 40649206 BLAKE2B e014ff318275547ec210aa13bba1377de726b80ee1389b593ab219fc4530a44766b29111444fbc08cf50b4ca61f6129683adeb0f3835afa3cfba729e9af285b1 SHA512 39fb3e3ef3bf024913a168f616fa436013f1d2b92be102b3dfead35219420791c11b3c1846ddae577a6ee4ae3aeb9601f11d1e7ce8daac99932f14699a497242
 DIST hydrus-501.tar.gz 40724774 BLAKE2B 6a93c4483b07e976fac829aee4c1f4c879f535ff0ce7e89c64b278bc3f7d77abdd9b906d48f87b175a1eccec2dcf962725abe0602fb68b009fbba9d0f3381067 SHA512 1c9275023f1d205bf916eb85566237fe8f25a446399065ebc371e1db8ca3c3e2501e8a82867e9f7711b007a74a9e88d838babca29a2556d19ffcf77b14182834
 DIST hydrus-505.tar.gz 40756022 BLAKE2B a5d9cfd5f8023a2f809c2610c48e8018ca7bb6002d1420485e463b3fe477cae07a2f4ea2cd823ff592a164d37e611938fe805d163cbf5512c636b972c1afad77 SHA512 f5c818616aa195b904d5cd65e77f29095f22fc9f435b0218110cb47e655c004c3ce3e72fc9de8ec8b1e9b508ced42b045131e0ddd6442fa43fc7d4d77877465e
 DIST hydrus-510.tar.gz 40813887 BLAKE2B 84ecc40897e0aa324005d05146ea1ac439e9576a376ab40641a948ddeb2a58b7f171a0b9c00f69bd34b218e195c8b77c505992c0b51372454bc3c8208f1ef485 SHA512 998cdd09bcbb8bf3ba611754f5237d5a743e89988bf3259ae7187ac8730e6183b433622c25fef400c0efdc9fd38dcbfa171e70da5be953557983d08f15c8b21e

diff --git a/media-gfx/hydrus/hydrus-497-r1.ebuild b/media-gfx/hydrus/hydrus-497-r1.ebuild
deleted file mode 100644
index 1ecb76ea0b7b..000000000000
--- a/media-gfx/hydrus/hydrus-497-r1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite"
-
-DOCS_BUILDER=mkdocs
-DOCS_DEPEND="dev-python/mkdocs-material"
-
-inherit python-single-r1 desktop docs optfeature
-
-DESCRIPTION="A booru-like media organizer for the desktop"
-HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
-else
-	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-	KEYWORDS="~amd64"
-fi
-
-# hydrus itself is WTFPL
-# icons included are CC-BY-2.5
-LICENSE="WTFPL-2 CC-BY-2.5"
-SLOT="0"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-# RDEPEND is sorted as such:
-# - No specific requirements
-# - Specific version or slot
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/cbor2[${PYTHON_USEDEP}]
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cloudscraper[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},lcms]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
-		dev-python/python-mpv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/twisted[${PYTHON_USEDEP}]
-		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
-		media-video/ffmpeg
-
-		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	')
-"
-BDEPEND="
-	${RDEPEND}
-	$(python_gen_cond_dep '
-		test? (
-			dev-python/httmock[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/nose[${PYTHON_USEDEP}]
-		)
-	')
-"
-
-PATCHES=(
-	"${FILESDIR}/userpath-in-local-share.patch"
-)
-
-src_prepare() {
-	default
-
-	# Contains pre-built binaries for other systems and a broken swf renderer for linux
-	rm -r bin/ || die
-	# Build files used for CI, not actually needed
-	rm -r static/build_files || die
-	# Python requirements files, not needed
-	rm requirements_*.txt || die
-}
-
-src_compile() {
-	python_optimize "${S}"
-	docs_compile
-}
-
-src_test() {
-	# The tests use unittest, but are run with a custom runner script.
-	# QT_QPA_PLATFORM is required to make them run without X
-	local -x QT_QPA_PLATFORM=offscreen
-	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
-}
-
-src_install() {
-	local doc="${EPREFIX}/usr/share/doc/${PF}"
-	elog "Hydrus includes an excellent manual, that can either be viewed at"
-	elog "${doc}/html/help/index.html"
-	elog "or accessed through the hydrus help menu."
-
-	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
-
-	local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/)
-	einstalldocs
-
-	# Files only needed for testing
-	rm test.py hydrus/hydrus_test.py || die
-	rm -r hydrus/test/ static/testing/ || die
-
-	# ${DOCS[@]} files are copied into doc
-	# ${S}/docs/ is the markdown source code for documentation
-	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
-	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
-	if use doc; then
-		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
-		rm -r "${S}/_build" || die
-		# The program expects to find documentation here, so add a symlink to doc
-		dosym "${doc}/html" /opt/hydrus/help
-	fi
-
-	insinto /opt/hydrus
-	doins -r "${S}"/.
-
-	exeinto /usr/bin
-	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
-	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
-
-	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
-					   "AudioVideo;FileTools;Graphics;Network;"
-}
-
-pkg_postinst() {
-	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
-	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
-	optfeature "memory compression in the client" "dev-python/lz4"
-	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
-}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2023-01-07 16:49 Joonas Niilola
  0 siblings, 0 replies; 104+ messages in thread
From: Joonas Niilola @ 2023-01-07 16:49 UTC (permalink / raw
  To: gentoo-commits

commit:     45e83eb0547a1396b95dfe35714330a17fbb9463
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Sun Dec 18 11:46:58 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Jan  7 16:43:29 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45e83eb0

media-gfx/hydrus: Add 510

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/hydrus/Manifest          |   1 +
 media-gfx/hydrus/hydrus-510.ebuild | 149 +++++++++++++++++++++++++++++++++++++
 2 files changed, 150 insertions(+)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index d159c2b24a8b..367ad71e3567 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,3 +1,4 @@
 DIST hydrus-497.tar.gz 40649206 BLAKE2B e014ff318275547ec210aa13bba1377de726b80ee1389b593ab219fc4530a44766b29111444fbc08cf50b4ca61f6129683adeb0f3835afa3cfba729e9af285b1 SHA512 39fb3e3ef3bf024913a168f616fa436013f1d2b92be102b3dfead35219420791c11b3c1846ddae577a6ee4ae3aeb9601f11d1e7ce8daac99932f14699a497242
 DIST hydrus-501.tar.gz 40724774 BLAKE2B 6a93c4483b07e976fac829aee4c1f4c879f535ff0ce7e89c64b278bc3f7d77abdd9b906d48f87b175a1eccec2dcf962725abe0602fb68b009fbba9d0f3381067 SHA512 1c9275023f1d205bf916eb85566237fe8f25a446399065ebc371e1db8ca3c3e2501e8a82867e9f7711b007a74a9e88d838babca29a2556d19ffcf77b14182834
 DIST hydrus-505.tar.gz 40756022 BLAKE2B a5d9cfd5f8023a2f809c2610c48e8018ca7bb6002d1420485e463b3fe477cae07a2f4ea2cd823ff592a164d37e611938fe805d163cbf5512c636b972c1afad77 SHA512 f5c818616aa195b904d5cd65e77f29095f22fc9f435b0218110cb47e655c004c3ce3e72fc9de8ec8b1e9b508ced42b045131e0ddd6442fa43fc7d4d77877465e
+DIST hydrus-510.tar.gz 40813887 BLAKE2B 84ecc40897e0aa324005d05146ea1ac439e9576a376ab40641a948ddeb2a58b7f171a0b9c00f69bd34b218e195c8b77c505992c0b51372454bc3c8208f1ef485 SHA512 998cdd09bcbb8bf3ba611754f5237d5a743e89988bf3259ae7187ac8730e6183b433622c25fef400c0efdc9fd38dcbfa171e70da5be953557983d08f15c8b21e

diff --git a/media-gfx/hydrus/hydrus-510.ebuild b/media-gfx/hydrus/hydrus-510.ebuild
new file mode 100644
index 000000000000..03954ae38a2f
--- /dev/null
+++ b/media-gfx/hydrus/hydrus-510.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="sqlite"
+
+DOCS_BUILDER=mkdocs
+DOCS_DEPEND="dev-python/mkdocs-material"
+
+inherit python-single-r1 desktop docs optfeature
+
+DESCRIPTION="A booru-like media organizer for the desktop"
+HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
+else
+	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+# hydrus itself is WTFPL
+# icons included are CC-BY-2.5
+LICENSE="WTFPL-2 CC-BY-2.5"
+SLOT="0"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+# RDEPEND is sorted as such:
+# - No specific requirements
+# - Specific version or slot
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/cbor2[${PYTHON_USEDEP}]
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cloudscraper[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},lcms]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
+		dev-python/python-mpv[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		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}]
+	')
+"
+BDEPEND="
+	${RDEPEND}
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/httmock[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/nose[${PYTHON_USEDEP}]
+		)
+	')
+"
+
+PATCHES=(
+	"${FILESDIR}/userpath-in-local-share.patch"
+)
+
+src_prepare() {
+	default
+
+	# Contains pre-built binaries for other systems and a broken swf renderer for linux
+	rm -r bin/ || die
+	# Build files used for CI and development, not actually needed
+	rm -r static/build_files static/requirements || die
+	# Python requirements file, not needed
+	rm requirements.txt || die
+	# Remove unneeded additional scripts
+	rm *.command *.sh *.bat || die
+}
+
+src_compile() {
+	python_optimize "${S}"
+	docs_compile
+}
+
+src_test() {
+	# The tests use unittest, but are run with a custom runner script.
+	# QT_QPA_PLATFORM is required to make them run without X
+	local -x QT_QPA_PLATFORM=offscreen
+	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
+}
+
+src_install() {
+	local doc="${EPREFIX}/usr/share/doc/${PF}"
+	elog "Hydrus includes an excellent manual, that can either be viewed at"
+	elog "${doc}/html/help/index.html"
+	elog "or accessed through the hydrus help menu."
+
+	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
+
+	local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/)
+	einstalldocs
+
+	# Files only needed for testing
+	rm test.py hydrus/hydrus_test.py || die
+	rm -r hydrus/test/ static/testing/ || die
+
+	# ${DOCS[@]} files are copied into doc
+	# ${S}/docs/ is the markdown source code for documentation
+	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
+	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
+	if use doc; then
+		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
+		rm -r "${S}/_build" || die
+		# The program expects to find documentation here, so add a symlink to doc
+		dosym "${doc}/html" /opt/hydrus/help
+	fi
+
+	insinto /opt/hydrus
+	doins -r "${S}"/.
+
+	exeinto /usr/bin
+	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
+	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
+
+	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
+					   "AudioVideo;FileTools;Graphics;Network;"
+}
+
+pkg_postinst() {
+	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
+	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
+	optfeature "memory compression in the client" "dev-python/lz4"
+	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
+}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2023-01-07 16:49 Joonas Niilola
  0 siblings, 0 replies; 104+ messages in thread
From: Joonas Niilola @ 2023-01-07 16:49 UTC (permalink / raw
  To: gentoo-commits

commit:     d317620a6e788ca6a9a5df0a291254f8a4c515b8
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Thu Dec 22 14:57:12 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Jan  7 16:43:29 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d317620a

media-gfx/hydrus: Add 511

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/hydrus/Manifest          |   1 +
 media-gfx/hydrus/hydrus-511.ebuild | 149 +++++++++++++++++++++++++++++++++++++
 2 files changed, 150 insertions(+)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index b97158a2b5ff..b50e50de9f36 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,3 +1,4 @@
 DIST hydrus-501.tar.gz 40724774 BLAKE2B 6a93c4483b07e976fac829aee4c1f4c879f535ff0ce7e89c64b278bc3f7d77abdd9b906d48f87b175a1eccec2dcf962725abe0602fb68b009fbba9d0f3381067 SHA512 1c9275023f1d205bf916eb85566237fe8f25a446399065ebc371e1db8ca3c3e2501e8a82867e9f7711b007a74a9e88d838babca29a2556d19ffcf77b14182834
 DIST hydrus-505.tar.gz 40756022 BLAKE2B a5d9cfd5f8023a2f809c2610c48e8018ca7bb6002d1420485e463b3fe477cae07a2f4ea2cd823ff592a164d37e611938fe805d163cbf5512c636b972c1afad77 SHA512 f5c818616aa195b904d5cd65e77f29095f22fc9f435b0218110cb47e655c004c3ce3e72fc9de8ec8b1e9b508ced42b045131e0ddd6442fa43fc7d4d77877465e
 DIST hydrus-510.tar.gz 40813887 BLAKE2B 84ecc40897e0aa324005d05146ea1ac439e9576a376ab40641a948ddeb2a58b7f171a0b9c00f69bd34b218e195c8b77c505992c0b51372454bc3c8208f1ef485 SHA512 998cdd09bcbb8bf3ba611754f5237d5a743e89988bf3259ae7187ac8730e6183b433622c25fef400c0efdc9fd38dcbfa171e70da5be953557983d08f15c8b21e
+DIST hydrus-511.tar.gz 40821597 BLAKE2B 15bff5bf7427ddef3a3700a883d0afe83090844c2052c41b1c4bfc13bce1f0052d48cc452d7e779c8b42a9a0d68901d27e750673ca2414c209db1c1fcd67a427 SHA512 d48d8e31b4eab80db917ebe6fe5ece719644e1b06ec8ca063a20044b39ad695b90c00340850be42c69ee163ab8866c0925c90752c74fdfbf40643dc02658b813

diff --git a/media-gfx/hydrus/hydrus-511.ebuild b/media-gfx/hydrus/hydrus-511.ebuild
new file mode 100644
index 000000000000..03954ae38a2f
--- /dev/null
+++ b/media-gfx/hydrus/hydrus-511.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="sqlite"
+
+DOCS_BUILDER=mkdocs
+DOCS_DEPEND="dev-python/mkdocs-material"
+
+inherit python-single-r1 desktop docs optfeature
+
+DESCRIPTION="A booru-like media organizer for the desktop"
+HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
+else
+	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+# hydrus itself is WTFPL
+# icons included are CC-BY-2.5
+LICENSE="WTFPL-2 CC-BY-2.5"
+SLOT="0"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+# RDEPEND is sorted as such:
+# - No specific requirements
+# - Specific version or slot
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/cbor2[${PYTHON_USEDEP}]
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cloudscraper[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},lcms]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
+		dev-python/python-mpv[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		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}]
+	')
+"
+BDEPEND="
+	${RDEPEND}
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/httmock[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/nose[${PYTHON_USEDEP}]
+		)
+	')
+"
+
+PATCHES=(
+	"${FILESDIR}/userpath-in-local-share.patch"
+)
+
+src_prepare() {
+	default
+
+	# Contains pre-built binaries for other systems and a broken swf renderer for linux
+	rm -r bin/ || die
+	# Build files used for CI and development, not actually needed
+	rm -r static/build_files static/requirements || die
+	# Python requirements file, not needed
+	rm requirements.txt || die
+	# Remove unneeded additional scripts
+	rm *.command *.sh *.bat || die
+}
+
+src_compile() {
+	python_optimize "${S}"
+	docs_compile
+}
+
+src_test() {
+	# The tests use unittest, but are run with a custom runner script.
+	# QT_QPA_PLATFORM is required to make them run without X
+	local -x QT_QPA_PLATFORM=offscreen
+	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
+}
+
+src_install() {
+	local doc="${EPREFIX}/usr/share/doc/${PF}"
+	elog "Hydrus includes an excellent manual, that can either be viewed at"
+	elog "${doc}/html/help/index.html"
+	elog "or accessed through the hydrus help menu."
+
+	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
+
+	local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/)
+	einstalldocs
+
+	# Files only needed for testing
+	rm test.py hydrus/hydrus_test.py || die
+	rm -r hydrus/test/ static/testing/ || die
+
+	# ${DOCS[@]} files are copied into doc
+	# ${S}/docs/ is the markdown source code for documentation
+	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
+	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
+	if use doc; then
+		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
+		rm -r "${S}/_build" || die
+		# The program expects to find documentation here, so add a symlink to doc
+		dosym "${doc}/html" /opt/hydrus/help
+	fi
+
+	insinto /opt/hydrus
+	doins -r "${S}"/.
+
+	exeinto /usr/bin
+	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
+	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
+
+	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
+					   "AudioVideo;FileTools;Graphics;Network;"
+}
+
+pkg_postinst() {
+	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
+	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
+	optfeature "memory compression in the client" "dev-python/lz4"
+	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
+}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2023-01-07 16:49 Joonas Niilola
  0 siblings, 0 replies; 104+ messages in thread
From: Joonas Niilola @ 2023-01-07 16:49 UTC (permalink / raw
  To: gentoo-commits

commit:     dc1bd10cff45e519bbe918a137e895f13d733597
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Sun Dec 25 20:12:41 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Jan  7 16:48:23 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc1bd10c

media-gfx/hydrus: Remove dependency on nose

Closes: https://bugs.gentoo.org/878707
Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://github.com/gentoo/gentoo/pull/28762
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/hydrus/hydrus-501-r1.ebuild | 1 -
 media-gfx/hydrus/hydrus-505.ebuild    | 1 -
 media-gfx/hydrus/hydrus-510.ebuild    | 1 -
 media-gfx/hydrus/hydrus-511.ebuild    | 1 -
 media-gfx/hydrus/hydrus-9999.ebuild   | 1 -
 5 files changed, 5 deletions(-)

diff --git a/media-gfx/hydrus/hydrus-501-r1.ebuild b/media-gfx/hydrus/hydrus-501-r1.ebuild
index 1ecb76ea0b7b..e9bc433e54ac 100644
--- a/media-gfx/hydrus/hydrus-501-r1.ebuild
+++ b/media-gfx/hydrus/hydrus-501-r1.ebuild
@@ -69,7 +69,6 @@ BDEPEND="
 		test? (
 			dev-python/httmock[${PYTHON_USEDEP}]
 			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/nose[${PYTHON_USEDEP}]
 		)
 	')
 "

diff --git a/media-gfx/hydrus/hydrus-505.ebuild b/media-gfx/hydrus/hydrus-505.ebuild
index ca93c8125f9a..9c9ecc644646 100644
--- a/media-gfx/hydrus/hydrus-505.ebuild
+++ b/media-gfx/hydrus/hydrus-505.ebuild
@@ -70,7 +70,6 @@ BDEPEND="
 		test? (
 			dev-python/httmock[${PYTHON_USEDEP}]
 			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/nose[${PYTHON_USEDEP}]
 		)
 	')
 "

diff --git a/media-gfx/hydrus/hydrus-510.ebuild b/media-gfx/hydrus/hydrus-510.ebuild
index 03954ae38a2f..153aadd00ef9 100644
--- a/media-gfx/hydrus/hydrus-510.ebuild
+++ b/media-gfx/hydrus/hydrus-510.ebuild
@@ -70,7 +70,6 @@ BDEPEND="
 		test? (
 			dev-python/httmock[${PYTHON_USEDEP}]
 			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/nose[${PYTHON_USEDEP}]
 		)
 	')
 "

diff --git a/media-gfx/hydrus/hydrus-511.ebuild b/media-gfx/hydrus/hydrus-511.ebuild
index 03954ae38a2f..153aadd00ef9 100644
--- a/media-gfx/hydrus/hydrus-511.ebuild
+++ b/media-gfx/hydrus/hydrus-511.ebuild
@@ -70,7 +70,6 @@ BDEPEND="
 		test? (
 			dev-python/httmock[${PYTHON_USEDEP}]
 			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/nose[${PYTHON_USEDEP}]
 		)
 	')
 "

diff --git a/media-gfx/hydrus/hydrus-9999.ebuild b/media-gfx/hydrus/hydrus-9999.ebuild
index 03954ae38a2f..153aadd00ef9 100644
--- a/media-gfx/hydrus/hydrus-9999.ebuild
+++ b/media-gfx/hydrus/hydrus-9999.ebuild
@@ -70,7 +70,6 @@ BDEPEND="
 		test? (
 			dev-python/httmock[${PYTHON_USEDEP}]
 			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/nose[${PYTHON_USEDEP}]
 		)
 	')
 "


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2023-01-07 16:49 Joonas Niilola
  0 siblings, 0 replies; 104+ messages in thread
From: Joonas Niilola @ 2023-01-07 16:49 UTC (permalink / raw
  To: gentoo-commits

commit:     61aa5798fb34a39c08a92b7c89b86402a2d6039f
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  7 16:44:19 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Jan  7 16:48:29 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61aa5798

media-gfx/hydrus: bump EAPI to 8, add missing +doc dependency

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/hydrus/hydrus-510.ebuild  | 6 +++---
 media-gfx/hydrus/hydrus-511.ebuild  | 6 +++---
 media-gfx/hydrus/hydrus-9999.ebuild | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/media-gfx/hydrus/hydrus-510.ebuild b/media-gfx/hydrus/hydrus-510.ebuild
index 153aadd00ef9..063824a750b8 100644
--- a/media-gfx/hydrus/hydrus-510.ebuild
+++ b/media-gfx/hydrus/hydrus-510.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite"
 
 DOCS_BUILDER=mkdocs
-DOCS_DEPEND="dev-python/mkdocs-material"
+DOCS_DEPEND="dev-python/mkdocs-material dev-python/regex"
 
 inherit python-single-r1 desktop docs optfeature
 

diff --git a/media-gfx/hydrus/hydrus-511.ebuild b/media-gfx/hydrus/hydrus-511.ebuild
index 153aadd00ef9..063824a750b8 100644
--- a/media-gfx/hydrus/hydrus-511.ebuild
+++ b/media-gfx/hydrus/hydrus-511.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite"
 
 DOCS_BUILDER=mkdocs
-DOCS_DEPEND="dev-python/mkdocs-material"
+DOCS_DEPEND="dev-python/mkdocs-material dev-python/regex"
 
 inherit python-single-r1 desktop docs optfeature
 

diff --git a/media-gfx/hydrus/hydrus-9999.ebuild b/media-gfx/hydrus/hydrus-9999.ebuild
index 153aadd00ef9..063824a750b8 100644
--- a/media-gfx/hydrus/hydrus-9999.ebuild
+++ b/media-gfx/hydrus/hydrus-9999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite"
 
 DOCS_BUILDER=mkdocs
-DOCS_DEPEND="dev-python/mkdocs-material"
+DOCS_DEPEND="dev-python/mkdocs-material dev-python/regex"
 
 inherit python-single-r1 desktop docs optfeature
 


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2023-01-07 16:49 Joonas Niilola
  0 siblings, 0 replies; 104+ messages in thread
From: Joonas Niilola @ 2023-01-07 16:49 UTC (permalink / raw
  To: gentoo-commits

commit:     4629552d5799727e69b950274af96de7ed248f07
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Sun Dec 18 11:48:01 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Jan  7 16:43:29 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4629552d

media-gfx/hydrus: Update 9999

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/hydrus/hydrus-9999.ebuild | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/media-gfx/hydrus/hydrus-9999.ebuild b/media-gfx/hydrus/hydrus-9999.ebuild
index 1ecb76ea0b7b..03954ae38a2f 100644
--- a/media-gfx/hydrus/hydrus-9999.ebuild
+++ b/media-gfx/hydrus/hydrus-9999.ebuild
@@ -58,6 +58,7 @@ 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}]
@@ -83,10 +84,12 @@ src_prepare() {
 
 	# Contains pre-built binaries for other systems and a broken swf renderer for linux
 	rm -r bin/ || die
-	# Build files used for CI, not actually needed
-	rm -r static/build_files || die
-	# Python requirements files, not needed
-	rm requirements_*.txt || die
+	# Build files used for CI and development, not actually needed
+	rm -r static/build_files static/requirements || die
+	# Python requirements file, not needed
+	rm requirements.txt || die
+	# Remove unneeded additional scripts
+	rm *.command *.sh *.bat || die
 }
 
 src_compile() {


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2023-02-05  9:13 Joonas Niilola
  0 siblings, 0 replies; 104+ messages in thread
From: Joonas Niilola @ 2023-02-05  9:13 UTC (permalink / raw
  To: gentoo-commits

commit:     15c5e93e4ca69b12e16b984323b1fabadef88698
Author:     Joshua Goins <josh <AT> redstrate <DOT> com>
AuthorDate: Sun Jan 22 17:49:34 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Feb  5 09:12:52 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15c5e93e

media-gfx/hydrus: add 512, 513

Signed-off-by: Joshua Goins <josh <AT> redstrate.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/hydrus/Manifest          |   2 +
 media-gfx/hydrus/hydrus-512.ebuild | 147 +++++++++++++++++++++++++++++++++++++
 media-gfx/hydrus/hydrus-513.ebuild | 147 +++++++++++++++++++++++++++++++++++++
 3 files changed, 296 insertions(+)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 948601b469ec..57f2930d1b66 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,2 +1,4 @@
 DIST hydrus-510.tar.gz 40813887 BLAKE2B 84ecc40897e0aa324005d05146ea1ac439e9576a376ab40641a948ddeb2a58b7f171a0b9c00f69bd34b218e195c8b77c505992c0b51372454bc3c8208f1ef485 SHA512 998cdd09bcbb8bf3ba611754f5237d5a743e89988bf3259ae7187ac8730e6183b433622c25fef400c0efdc9fd38dcbfa171e70da5be953557983d08f15c8b21e
 DIST hydrus-511.tar.gz 40821597 BLAKE2B 15bff5bf7427ddef3a3700a883d0afe83090844c2052c41b1c4bfc13bce1f0052d48cc452d7e779c8b42a9a0d68901d27e750673ca2414c209db1c1fcd67a427 SHA512 d48d8e31b4eab80db917ebe6fe5ece719644e1b06ec8ca063a20044b39ad695b90c00340850be42c69ee163ab8866c0925c90752c74fdfbf40643dc02658b813
+DIST hydrus-512.tar.gz 40799009 BLAKE2B 9e362f3df5d85e2321c5701af22ef6772795f815f3d1e1826f92a73c5704ba391dc9a7679fc3919219f952d5853a79daf346d9d040e35c90b0c912ff15cd86cd SHA512 01b22cef4766be606553b7827ae5dd8d65d6e1457f8553cf88c45d593c73edc7ca9b181181b9eaf1f5ff8a25f6b6ea9d7d364dff7553439a54d9851a488368ae
+DIST hydrus-513.tar.gz 40808152 BLAKE2B e54555ac7aa992d6c7a7d30a60a344e1faeaf24f7a6e00f9fabcce9cec05b02044bd980f7b5db344563c5ca1ada38e4d85bd064f6b6429eeae32017c2496e534 SHA512 c31e8ef4beb3b88111516bb615b9cae689b4bd1ebb835b1d57915dfb761d5b9413c39cc58352e3a13e3efd3423f312696380160453249884ea8cb980c674235e

diff --git a/media-gfx/hydrus/hydrus-512.ebuild b/media-gfx/hydrus/hydrus-512.ebuild
new file mode 100644
index 000000000000..6036cc0f1d38
--- /dev/null
+++ b/media-gfx/hydrus/hydrus-512.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_REQ_USE="sqlite"
+
+DOCS_BUILDER=mkdocs
+DOCS_DEPEND="dev-python/mkdocs-material dev-python/regex"
+
+inherit python-single-r1 desktop docs optfeature
+
+DESCRIPTION="A booru-like media organizer for the desktop"
+HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
+else
+	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+# hydrus itself is WTFPL
+# icons included are CC-BY-2.5
+LICENSE="WTFPL-2 CC-BY-2.5"
+SLOT="0"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+# RDEPEND is sorted as such:
+# - No specific requirements
+# - Specific version or slot
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/cbor2[${PYTHON_USEDEP}]
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cloudscraper[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},lcms]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
+		dev-python/python-mpv[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/twisted[${PYTHON_USEDEP}]
+		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
+		media-video/ffmpeg
+
+		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	')
+"
+BDEPEND="
+	${RDEPEND}
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/httmock[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+		)
+	')
+"
+
+PATCHES=(
+	"${FILESDIR}/userpath-in-local-share.patch"
+)
+
+src_prepare() {
+	default
+
+	# Contains pre-built binaries for other systems and a broken swf renderer for linux
+	rm -r bin/ || die
+	# Build files used for CI and development, not actually needed
+	rm -r static/build_files static/requirements || die
+	# Python requirements file, not needed
+	rm requirements.txt || die
+	# Remove unneeded additional scripts
+	rm *.command *.sh *.bat || die
+}
+
+src_compile() {
+	python_optimize "${S}"
+	docs_compile
+}
+
+src_test() {
+	# The tests use unittest, but are run with a custom runner script.
+	# QT_QPA_PLATFORM is required to make them run without X
+	local -x QT_QPA_PLATFORM=offscreen
+	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
+}
+
+src_install() {
+	local doc="${EPREFIX}/usr/share/doc/${PF}"
+	elog "Hydrus includes an excellent manual, that can either be viewed at"
+	elog "${doc}/html/help/index.html"
+	elog "or accessed through the hydrus help menu."
+
+	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
+
+	local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/)
+	einstalldocs
+
+	# Files only needed for testing
+	rm test.py hydrus/hydrus_test.py || die
+	rm -r hydrus/test/ static/testing/ || die
+
+	# ${DOCS[@]} files are copied into doc
+	# ${S}/docs/ is the markdown source code for documentation
+	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
+	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
+	if use doc; then
+		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
+		rm -r "${S}/_build" || die
+		# The program expects to find documentation here, so add a symlink to doc
+		dosym "${doc}/html" /opt/hydrus/help
+	fi
+
+	insinto /opt/hydrus
+	doins -r "${S}"/.
+
+	exeinto /usr/bin
+	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
+	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
+
+	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
+					   "AudioVideo;FileTools;Graphics;Network;"
+}
+
+pkg_postinst() {
+	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
+	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
+	optfeature "memory compression in the client" "dev-python/lz4"
+	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
+}

diff --git a/media-gfx/hydrus/hydrus-513.ebuild b/media-gfx/hydrus/hydrus-513.ebuild
new file mode 100644
index 000000000000..6036cc0f1d38
--- /dev/null
+++ b/media-gfx/hydrus/hydrus-513.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_REQ_USE="sqlite"
+
+DOCS_BUILDER=mkdocs
+DOCS_DEPEND="dev-python/mkdocs-material dev-python/regex"
+
+inherit python-single-r1 desktop docs optfeature
+
+DESCRIPTION="A booru-like media organizer for the desktop"
+HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
+else
+	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+# hydrus itself is WTFPL
+# icons included are CC-BY-2.5
+LICENSE="WTFPL-2 CC-BY-2.5"
+SLOT="0"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+# RDEPEND is sorted as such:
+# - No specific requirements
+# - Specific version or slot
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/cbor2[${PYTHON_USEDEP}]
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cloudscraper[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},lcms]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
+		dev-python/python-mpv[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/twisted[${PYTHON_USEDEP}]
+		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
+		media-video/ffmpeg
+
+		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	')
+"
+BDEPEND="
+	${RDEPEND}
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/httmock[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+		)
+	')
+"
+
+PATCHES=(
+	"${FILESDIR}/userpath-in-local-share.patch"
+)
+
+src_prepare() {
+	default
+
+	# Contains pre-built binaries for other systems and a broken swf renderer for linux
+	rm -r bin/ || die
+	# Build files used for CI and development, not actually needed
+	rm -r static/build_files static/requirements || die
+	# Python requirements file, not needed
+	rm requirements.txt || die
+	# Remove unneeded additional scripts
+	rm *.command *.sh *.bat || die
+}
+
+src_compile() {
+	python_optimize "${S}"
+	docs_compile
+}
+
+src_test() {
+	# The tests use unittest, but are run with a custom runner script.
+	# QT_QPA_PLATFORM is required to make them run without X
+	local -x QT_QPA_PLATFORM=offscreen
+	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
+}
+
+src_install() {
+	local doc="${EPREFIX}/usr/share/doc/${PF}"
+	elog "Hydrus includes an excellent manual, that can either be viewed at"
+	elog "${doc}/html/help/index.html"
+	elog "or accessed through the hydrus help menu."
+
+	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
+
+	local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/)
+	einstalldocs
+
+	# Files only needed for testing
+	rm test.py hydrus/hydrus_test.py || die
+	rm -r hydrus/test/ static/testing/ || die
+
+	# ${DOCS[@]} files are copied into doc
+	# ${S}/docs/ is the markdown source code for documentation
+	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
+	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
+	if use doc; then
+		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
+		rm -r "${S}/_build" || die
+		# The program expects to find documentation here, so add a symlink to doc
+		dosym "${doc}/html" /opt/hydrus/help
+	fi
+
+	insinto /opt/hydrus
+	doins -r "${S}"/.
+
+	exeinto /usr/bin
+	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
+	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
+
+	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
+					   "AudioVideo;FileTools;Graphics;Network;"
+}
+
+pkg_postinst() {
+	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
+	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
+	optfeature "memory compression in the client" "dev-python/lz4"
+	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
+}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2023-02-05  9:13 Joonas Niilola
  0 siblings, 0 replies; 104+ messages in thread
From: Joonas Niilola @ 2023-02-05  9:13 UTC (permalink / raw
  To: gentoo-commits

commit:     f80203d37edcfe9faad3dc04868558c1195fe434
Author:     Joshua Goins <josh <AT> redstrate <DOT> com>
AuthorDate: Sun Jan 22 17:50:23 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Feb  5 09:12:52 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f80203d3

media-gfx/hydrus: drop 510, 511

Signed-off-by: Joshua Goins <josh <AT> redstrate.com>
Closes: https://github.com/gentoo/gentoo/pull/29220
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/hydrus/Manifest          |   2 -
 media-gfx/hydrus/hydrus-510.ebuild | 148 -------------------------------------
 media-gfx/hydrus/hydrus-511.ebuild | 148 -------------------------------------
 3 files changed, 298 deletions(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 57f2930d1b66..cba6660be58d 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,4 +1,2 @@
-DIST hydrus-510.tar.gz 40813887 BLAKE2B 84ecc40897e0aa324005d05146ea1ac439e9576a376ab40641a948ddeb2a58b7f171a0b9c00f69bd34b218e195c8b77c505992c0b51372454bc3c8208f1ef485 SHA512 998cdd09bcbb8bf3ba611754f5237d5a743e89988bf3259ae7187ac8730e6183b433622c25fef400c0efdc9fd38dcbfa171e70da5be953557983d08f15c8b21e
-DIST hydrus-511.tar.gz 40821597 BLAKE2B 15bff5bf7427ddef3a3700a883d0afe83090844c2052c41b1c4bfc13bce1f0052d48cc452d7e779c8b42a9a0d68901d27e750673ca2414c209db1c1fcd67a427 SHA512 d48d8e31b4eab80db917ebe6fe5ece719644e1b06ec8ca063a20044b39ad695b90c00340850be42c69ee163ab8866c0925c90752c74fdfbf40643dc02658b813
 DIST hydrus-512.tar.gz 40799009 BLAKE2B 9e362f3df5d85e2321c5701af22ef6772795f815f3d1e1826f92a73c5704ba391dc9a7679fc3919219f952d5853a79daf346d9d040e35c90b0c912ff15cd86cd SHA512 01b22cef4766be606553b7827ae5dd8d65d6e1457f8553cf88c45d593c73edc7ca9b181181b9eaf1f5ff8a25f6b6ea9d7d364dff7553439a54d9851a488368ae
 DIST hydrus-513.tar.gz 40808152 BLAKE2B e54555ac7aa992d6c7a7d30a60a344e1faeaf24f7a6e00f9fabcce9cec05b02044bd980f7b5db344563c5ca1ada38e4d85bd064f6b6429eeae32017c2496e534 SHA512 c31e8ef4beb3b88111516bb615b9cae689b4bd1ebb835b1d57915dfb761d5b9413c39cc58352e3a13e3efd3423f312696380160453249884ea8cb980c674235e

diff --git a/media-gfx/hydrus/hydrus-510.ebuild b/media-gfx/hydrus/hydrus-510.ebuild
deleted file mode 100644
index e447f565f37b..000000000000
--- a/media-gfx/hydrus/hydrus-510.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-PYTHON_REQ_USE="sqlite"
-
-DOCS_BUILDER=mkdocs
-DOCS_DEPEND="dev-python/mkdocs-material dev-python/regex"
-
-inherit python-single-r1 desktop docs optfeature
-
-DESCRIPTION="A booru-like media organizer for the desktop"
-HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
-else
-	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-	KEYWORDS="~amd64"
-fi
-
-# hydrus itself is WTFPL
-# icons included are CC-BY-2.5
-LICENSE="WTFPL-2 CC-BY-2.5"
-SLOT="0"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-# RDEPEND is sorted as such:
-# - No specific requirements
-# - Specific version or slot
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/cbor2[${PYTHON_USEDEP}]
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cloudscraper[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},lcms]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
-		dev-python/python-mpv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		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}]
-	')
-"
-BDEPEND="
-	${RDEPEND}
-	$(python_gen_cond_dep '
-		test? (
-			dev-python/httmock[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-		)
-	')
-"
-
-PATCHES=(
-	"${FILESDIR}/userpath-in-local-share.patch"
-)
-
-src_prepare() {
-	default
-
-	# Contains pre-built binaries for other systems and a broken swf renderer for linux
-	rm -r bin/ || die
-	# Build files used for CI and development, not actually needed
-	rm -r static/build_files static/requirements || die
-	# Python requirements file, not needed
-	rm requirements.txt || die
-	# Remove unneeded additional scripts
-	rm *.command *.sh *.bat || die
-}
-
-src_compile() {
-	python_optimize "${S}"
-	docs_compile
-}
-
-src_test() {
-	# The tests use unittest, but are run with a custom runner script.
-	# QT_QPA_PLATFORM is required to make them run without X
-	local -x QT_QPA_PLATFORM=offscreen
-	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
-}
-
-src_install() {
-	local doc="${EPREFIX}/usr/share/doc/${PF}"
-	elog "Hydrus includes an excellent manual, that can either be viewed at"
-	elog "${doc}/html/help/index.html"
-	elog "or accessed through the hydrus help menu."
-
-	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
-
-	local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/)
-	einstalldocs
-
-	# Files only needed for testing
-	rm test.py hydrus/hydrus_test.py || die
-	rm -r hydrus/test/ static/testing/ || die
-
-	# ${DOCS[@]} files are copied into doc
-	# ${S}/docs/ is the markdown source code for documentation
-	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
-	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
-	if use doc; then
-		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
-		rm -r "${S}/_build" || die
-		# The program expects to find documentation here, so add a symlink to doc
-		dosym "${doc}/html" /opt/hydrus/help
-	fi
-
-	insinto /opt/hydrus
-	doins -r "${S}"/.
-
-	exeinto /usr/bin
-	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
-	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
-
-	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
-					   "AudioVideo;FileTools;Graphics;Network;"
-}
-
-pkg_postinst() {
-	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
-	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
-	optfeature "memory compression in the client" "dev-python/lz4"
-	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
-}

diff --git a/media-gfx/hydrus/hydrus-511.ebuild b/media-gfx/hydrus/hydrus-511.ebuild
deleted file mode 100644
index e447f565f37b..000000000000
--- a/media-gfx/hydrus/hydrus-511.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-PYTHON_REQ_USE="sqlite"
-
-DOCS_BUILDER=mkdocs
-DOCS_DEPEND="dev-python/mkdocs-material dev-python/regex"
-
-inherit python-single-r1 desktop docs optfeature
-
-DESCRIPTION="A booru-like media organizer for the desktop"
-HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
-else
-	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-	KEYWORDS="~amd64"
-fi
-
-# hydrus itself is WTFPL
-# icons included are CC-BY-2.5
-LICENSE="WTFPL-2 CC-BY-2.5"
-SLOT="0"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-# RDEPEND is sorted as such:
-# - No specific requirements
-# - Specific version or slot
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/cbor2[${PYTHON_USEDEP}]
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cloudscraper[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},lcms]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
-		dev-python/python-mpv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		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}]
-	')
-"
-BDEPEND="
-	${RDEPEND}
-	$(python_gen_cond_dep '
-		test? (
-			dev-python/httmock[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-		)
-	')
-"
-
-PATCHES=(
-	"${FILESDIR}/userpath-in-local-share.patch"
-)
-
-src_prepare() {
-	default
-
-	# Contains pre-built binaries for other systems and a broken swf renderer for linux
-	rm -r bin/ || die
-	# Build files used for CI and development, not actually needed
-	rm -r static/build_files static/requirements || die
-	# Python requirements file, not needed
-	rm requirements.txt || die
-	# Remove unneeded additional scripts
-	rm *.command *.sh *.bat || die
-}
-
-src_compile() {
-	python_optimize "${S}"
-	docs_compile
-}
-
-src_test() {
-	# The tests use unittest, but are run with a custom runner script.
-	# QT_QPA_PLATFORM is required to make them run without X
-	local -x QT_QPA_PLATFORM=offscreen
-	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
-}
-
-src_install() {
-	local doc="${EPREFIX}/usr/share/doc/${PF}"
-	elog "Hydrus includes an excellent manual, that can either be viewed at"
-	elog "${doc}/html/help/index.html"
-	elog "or accessed through the hydrus help menu."
-
-	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
-
-	local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/)
-	einstalldocs
-
-	# Files only needed for testing
-	rm test.py hydrus/hydrus_test.py || die
-	rm -r hydrus/test/ static/testing/ || die
-
-	# ${DOCS[@]} files are copied into doc
-	# ${S}/docs/ is the markdown source code for documentation
-	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
-	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
-	if use doc; then
-		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
-		rm -r "${S}/_build" || die
-		# The program expects to find documentation here, so add a symlink to doc
-		dosym "${doc}/html" /opt/hydrus/help
-	fi
-
-	insinto /opt/hydrus
-	doins -r "${S}"/.
-
-	exeinto /usr/bin
-	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
-	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
-
-	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
-					   "AudioVideo;FileTools;Graphics;Network;"
-}
-
-pkg_postinst() {
-	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
-	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
-	optfeature "memory compression in the client" "dev-python/lz4"
-	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
-}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2023-02-13  4:48 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2023-02-13  4:48 UTC (permalink / raw
  To: gentoo-commits

commit:     ff31c3ec4ebb78bbf889d76a66947b1d386e35cf
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Thu Feb  9 08:48:52 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 13 04:47:08 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff31c3ec

media-gfx/hydrus: Drop 512, 513

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/Manifest          |   2 -
 media-gfx/hydrus/hydrus-512.ebuild | 147 -------------------------------------
 media-gfx/hydrus/hydrus-513.ebuild | 147 -------------------------------------
 3 files changed, 296 deletions(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index cba6660be58d..e69de29bb2d1 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,2 +0,0 @@
-DIST hydrus-512.tar.gz 40799009 BLAKE2B 9e362f3df5d85e2321c5701af22ef6772795f815f3d1e1826f92a73c5704ba391dc9a7679fc3919219f952d5853a79daf346d9d040e35c90b0c912ff15cd86cd SHA512 01b22cef4766be606553b7827ae5dd8d65d6e1457f8553cf88c45d593c73edc7ca9b181181b9eaf1f5ff8a25f6b6ea9d7d364dff7553439a54d9851a488368ae
-DIST hydrus-513.tar.gz 40808152 BLAKE2B e54555ac7aa992d6c7a7d30a60a344e1faeaf24f7a6e00f9fabcce9cec05b02044bd980f7b5db344563c5ca1ada38e4d85bd064f6b6429eeae32017c2496e534 SHA512 c31e8ef4beb3b88111516bb615b9cae689b4bd1ebb835b1d57915dfb761d5b9413c39cc58352e3a13e3efd3423f312696380160453249884ea8cb980c674235e

diff --git a/media-gfx/hydrus/hydrus-512.ebuild b/media-gfx/hydrus/hydrus-512.ebuild
deleted file mode 100644
index 6036cc0f1d38..000000000000
--- a/media-gfx/hydrus/hydrus-512.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-PYTHON_REQ_USE="sqlite"
-
-DOCS_BUILDER=mkdocs
-DOCS_DEPEND="dev-python/mkdocs-material dev-python/regex"
-
-inherit python-single-r1 desktop docs optfeature
-
-DESCRIPTION="A booru-like media organizer for the desktop"
-HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
-else
-	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-	KEYWORDS="~amd64"
-fi
-
-# hydrus itself is WTFPL
-# icons included are CC-BY-2.5
-LICENSE="WTFPL-2 CC-BY-2.5"
-SLOT="0"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-# RDEPEND is sorted as such:
-# - No specific requirements
-# - Specific version or slot
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/cbor2[${PYTHON_USEDEP}]
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cloudscraper[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},lcms]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
-		dev-python/python-mpv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/twisted[${PYTHON_USEDEP}]
-		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
-		media-video/ffmpeg
-
-		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	')
-"
-BDEPEND="
-	${RDEPEND}
-	$(python_gen_cond_dep '
-		test? (
-			dev-python/httmock[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-		)
-	')
-"
-
-PATCHES=(
-	"${FILESDIR}/userpath-in-local-share.patch"
-)
-
-src_prepare() {
-	default
-
-	# Contains pre-built binaries for other systems and a broken swf renderer for linux
-	rm -r bin/ || die
-	# Build files used for CI and development, not actually needed
-	rm -r static/build_files static/requirements || die
-	# Python requirements file, not needed
-	rm requirements.txt || die
-	# Remove unneeded additional scripts
-	rm *.command *.sh *.bat || die
-}
-
-src_compile() {
-	python_optimize "${S}"
-	docs_compile
-}
-
-src_test() {
-	# The tests use unittest, but are run with a custom runner script.
-	# QT_QPA_PLATFORM is required to make them run without X
-	local -x QT_QPA_PLATFORM=offscreen
-	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
-}
-
-src_install() {
-	local doc="${EPREFIX}/usr/share/doc/${PF}"
-	elog "Hydrus includes an excellent manual, that can either be viewed at"
-	elog "${doc}/html/help/index.html"
-	elog "or accessed through the hydrus help menu."
-
-	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
-
-	local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/)
-	einstalldocs
-
-	# Files only needed for testing
-	rm test.py hydrus/hydrus_test.py || die
-	rm -r hydrus/test/ static/testing/ || die
-
-	# ${DOCS[@]} files are copied into doc
-	# ${S}/docs/ is the markdown source code for documentation
-	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
-	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
-	if use doc; then
-		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
-		rm -r "${S}/_build" || die
-		# The program expects to find documentation here, so add a symlink to doc
-		dosym "${doc}/html" /opt/hydrus/help
-	fi
-
-	insinto /opt/hydrus
-	doins -r "${S}"/.
-
-	exeinto /usr/bin
-	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
-	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
-
-	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
-					   "AudioVideo;FileTools;Graphics;Network;"
-}
-
-pkg_postinst() {
-	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
-	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
-	optfeature "memory compression in the client" "dev-python/lz4"
-	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
-}

diff --git a/media-gfx/hydrus/hydrus-513.ebuild b/media-gfx/hydrus/hydrus-513.ebuild
deleted file mode 100644
index 6036cc0f1d38..000000000000
--- a/media-gfx/hydrus/hydrus-513.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-PYTHON_REQ_USE="sqlite"
-
-DOCS_BUILDER=mkdocs
-DOCS_DEPEND="dev-python/mkdocs-material dev-python/regex"
-
-inherit python-single-r1 desktop docs optfeature
-
-DESCRIPTION="A booru-like media organizer for the desktop"
-HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
-else
-	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-	KEYWORDS="~amd64"
-fi
-
-# hydrus itself is WTFPL
-# icons included are CC-BY-2.5
-LICENSE="WTFPL-2 CC-BY-2.5"
-SLOT="0"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-# RDEPEND is sorted as such:
-# - No specific requirements
-# - Specific version or slot
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/cbor2[${PYTHON_USEDEP}]
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cloudscraper[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},lcms]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
-		dev-python/python-mpv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/twisted[${PYTHON_USEDEP}]
-		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
-		media-video/ffmpeg
-
-		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	')
-"
-BDEPEND="
-	${RDEPEND}
-	$(python_gen_cond_dep '
-		test? (
-			dev-python/httmock[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-		)
-	')
-"
-
-PATCHES=(
-	"${FILESDIR}/userpath-in-local-share.patch"
-)
-
-src_prepare() {
-	default
-
-	# Contains pre-built binaries for other systems and a broken swf renderer for linux
-	rm -r bin/ || die
-	# Build files used for CI and development, not actually needed
-	rm -r static/build_files static/requirements || die
-	# Python requirements file, not needed
-	rm requirements.txt || die
-	# Remove unneeded additional scripts
-	rm *.command *.sh *.bat || die
-}
-
-src_compile() {
-	python_optimize "${S}"
-	docs_compile
-}
-
-src_test() {
-	# The tests use unittest, but are run with a custom runner script.
-	# QT_QPA_PLATFORM is required to make them run without X
-	local -x QT_QPA_PLATFORM=offscreen
-	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
-}
-
-src_install() {
-	local doc="${EPREFIX}/usr/share/doc/${PF}"
-	elog "Hydrus includes an excellent manual, that can either be viewed at"
-	elog "${doc}/html/help/index.html"
-	elog "or accessed through the hydrus help menu."
-
-	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
-
-	local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/)
-	einstalldocs
-
-	# Files only needed for testing
-	rm test.py hydrus/hydrus_test.py || die
-	rm -r hydrus/test/ static/testing/ || die
-
-	# ${DOCS[@]} files are copied into doc
-	# ${S}/docs/ is the markdown source code for documentation
-	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
-	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
-	if use doc; then
-		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
-		rm -r "${S}/_build" || die
-		# The program expects to find documentation here, so add a symlink to doc
-		dosym "${doc}/html" /opt/hydrus/help
-	fi
-
-	insinto /opt/hydrus
-	doins -r "${S}"/.
-
-	exeinto /usr/bin
-	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
-	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
-
-	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
-					   "AudioVideo;FileTools;Graphics;Network;"
-}
-
-pkg_postinst() {
-	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
-	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
-	optfeature "memory compression in the client" "dev-python/lz4"
-	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
-}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2023-02-13  4:48 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2023-02-13  4:48 UTC (permalink / raw
  To: gentoo-commits

commit:     05a4735850fb023423134e44320ffe93a79b5fa8
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Thu Feb  9 08:49:08 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 13 04:47:09 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05a47358

media-gfx/hydrus: Add 515, 516

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://github.com/gentoo/gentoo/pull/29505
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/Manifest          |   2 +
 media-gfx/hydrus/hydrus-515.ebuild | 147 +++++++++++++++++++++++++++++++++++++
 media-gfx/hydrus/hydrus-516.ebuild | 147 +++++++++++++++++++++++++++++++++++++
 3 files changed, 296 insertions(+)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index e69de29bb2d1..1bbfaaea4539 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -0,0 +1,2 @@
+DIST hydrus-515.tar.gz 41096030 BLAKE2B 47f09ef0b0a0c83960f7feadac28d14a051235a3f4601d6a0518b05c7c62ba4b0ec0093a474b232cc2bbca77c21579a69d963eb8372d7bab3d8ddd67a6067f1b SHA512 b8d330b546de1f8b4aa319783893d3fdfda7926faa05fd9494713e0a9f975b507eb1e42d56917a71721836162929f9bab78579f291aa72150f6e124c63bc259d
+DIST hydrus-516.tar.gz 41098992 BLAKE2B 4195ade87f9f42f5aaf592ae502e49404d3fb188f7921c137973e7df31af8bb346c243a375e99014cfa9e3d6821a187b254cfe79f88c470cf54aa45e50e9bb22 SHA512 941cb81fba305708a1c33250aae366ae3bf8ba83d9aab90475bec09109608c86b68fdcc84d18a4fe324f57b2b91b8531887d9792b9d9130c5234f9cfa96e106f

diff --git a/media-gfx/hydrus/hydrus-515.ebuild b/media-gfx/hydrus/hydrus-515.ebuild
new file mode 100644
index 000000000000..6036cc0f1d38
--- /dev/null
+++ b/media-gfx/hydrus/hydrus-515.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_REQ_USE="sqlite"
+
+DOCS_BUILDER=mkdocs
+DOCS_DEPEND="dev-python/mkdocs-material dev-python/regex"
+
+inherit python-single-r1 desktop docs optfeature
+
+DESCRIPTION="A booru-like media organizer for the desktop"
+HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
+else
+	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+# hydrus itself is WTFPL
+# icons included are CC-BY-2.5
+LICENSE="WTFPL-2 CC-BY-2.5"
+SLOT="0"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+# RDEPEND is sorted as such:
+# - No specific requirements
+# - Specific version or slot
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/cbor2[${PYTHON_USEDEP}]
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cloudscraper[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},lcms]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
+		dev-python/python-mpv[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/twisted[${PYTHON_USEDEP}]
+		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
+		media-video/ffmpeg
+
+		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	')
+"
+BDEPEND="
+	${RDEPEND}
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/httmock[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+		)
+	')
+"
+
+PATCHES=(
+	"${FILESDIR}/userpath-in-local-share.patch"
+)
+
+src_prepare() {
+	default
+
+	# Contains pre-built binaries for other systems and a broken swf renderer for linux
+	rm -r bin/ || die
+	# Build files used for CI and development, not actually needed
+	rm -r static/build_files static/requirements || die
+	# Python requirements file, not needed
+	rm requirements.txt || die
+	# Remove unneeded additional scripts
+	rm *.command *.sh *.bat || die
+}
+
+src_compile() {
+	python_optimize "${S}"
+	docs_compile
+}
+
+src_test() {
+	# The tests use unittest, but are run with a custom runner script.
+	# QT_QPA_PLATFORM is required to make them run without X
+	local -x QT_QPA_PLATFORM=offscreen
+	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
+}
+
+src_install() {
+	local doc="${EPREFIX}/usr/share/doc/${PF}"
+	elog "Hydrus includes an excellent manual, that can either be viewed at"
+	elog "${doc}/html/help/index.html"
+	elog "or accessed through the hydrus help menu."
+
+	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
+
+	local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/)
+	einstalldocs
+
+	# Files only needed for testing
+	rm test.py hydrus/hydrus_test.py || die
+	rm -r hydrus/test/ static/testing/ || die
+
+	# ${DOCS[@]} files are copied into doc
+	# ${S}/docs/ is the markdown source code for documentation
+	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
+	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
+	if use doc; then
+		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
+		rm -r "${S}/_build" || die
+		# The program expects to find documentation here, so add a symlink to doc
+		dosym "${doc}/html" /opt/hydrus/help
+	fi
+
+	insinto /opt/hydrus
+	doins -r "${S}"/.
+
+	exeinto /usr/bin
+	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
+	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
+
+	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
+					   "AudioVideo;FileTools;Graphics;Network;"
+}
+
+pkg_postinst() {
+	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
+	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
+	optfeature "memory compression in the client" "dev-python/lz4"
+	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
+}

diff --git a/media-gfx/hydrus/hydrus-516.ebuild b/media-gfx/hydrus/hydrus-516.ebuild
new file mode 100644
index 000000000000..6036cc0f1d38
--- /dev/null
+++ b/media-gfx/hydrus/hydrus-516.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_REQ_USE="sqlite"
+
+DOCS_BUILDER=mkdocs
+DOCS_DEPEND="dev-python/mkdocs-material dev-python/regex"
+
+inherit python-single-r1 desktop docs optfeature
+
+DESCRIPTION="A booru-like media organizer for the desktop"
+HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
+else
+	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+# hydrus itself is WTFPL
+# icons included are CC-BY-2.5
+LICENSE="WTFPL-2 CC-BY-2.5"
+SLOT="0"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+# RDEPEND is sorted as such:
+# - No specific requirements
+# - Specific version or slot
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/cbor2[${PYTHON_USEDEP}]
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cloudscraper[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},lcms]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
+		dev-python/python-mpv[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/twisted[${PYTHON_USEDEP}]
+		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
+		media-video/ffmpeg
+
+		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	')
+"
+BDEPEND="
+	${RDEPEND}
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/httmock[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+		)
+	')
+"
+
+PATCHES=(
+	"${FILESDIR}/userpath-in-local-share.patch"
+)
+
+src_prepare() {
+	default
+
+	# Contains pre-built binaries for other systems and a broken swf renderer for linux
+	rm -r bin/ || die
+	# Build files used for CI and development, not actually needed
+	rm -r static/build_files static/requirements || die
+	# Python requirements file, not needed
+	rm requirements.txt || die
+	# Remove unneeded additional scripts
+	rm *.command *.sh *.bat || die
+}
+
+src_compile() {
+	python_optimize "${S}"
+	docs_compile
+}
+
+src_test() {
+	# The tests use unittest, but are run with a custom runner script.
+	# QT_QPA_PLATFORM is required to make them run without X
+	local -x QT_QPA_PLATFORM=offscreen
+	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
+}
+
+src_install() {
+	local doc="${EPREFIX}/usr/share/doc/${PF}"
+	elog "Hydrus includes an excellent manual, that can either be viewed at"
+	elog "${doc}/html/help/index.html"
+	elog "or accessed through the hydrus help menu."
+
+	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
+
+	local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/)
+	einstalldocs
+
+	# Files only needed for testing
+	rm test.py hydrus/hydrus_test.py || die
+	rm -r hydrus/test/ static/testing/ || die
+
+	# ${DOCS[@]} files are copied into doc
+	# ${S}/docs/ is the markdown source code for documentation
+	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
+	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
+	if use doc; then
+		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
+		rm -r "${S}/_build" || die
+		# The program expects to find documentation here, so add a symlink to doc
+		dosym "${doc}/html" /opt/hydrus/help
+	fi
+
+	insinto /opt/hydrus
+	doins -r "${S}"/.
+
+	exeinto /usr/bin
+	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
+	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
+
+	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
+					   "AudioVideo;FileTools;Graphics;Network;"
+}
+
+pkg_postinst() {
+	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
+	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
+	optfeature "memory compression in the client" "dev-python/lz4"
+	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
+}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2023-02-26  4:01 Michał Górny
  0 siblings, 0 replies; 104+ messages in thread
From: Michał Górny @ 2023-02-26  4:01 UTC (permalink / raw
  To: gentoo-commits

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() {


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2023-02-26  4:01 Michał Górny
  0 siblings, 0 replies; 104+ messages in thread
From: Michał Górny @ 2023-02-26  4:01 UTC (permalink / raw
  To: gentoo-commits

commit:     80a9febe202659268bad14a920b31b1ded639a41
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Sat Feb 25 16:47:28 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb 26 03:59:51 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80a9febe

media-gfx/hydrus: Drop 515

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 media-gfx/hydrus/Manifest          |   1 -
 media-gfx/hydrus/hydrus-515.ebuild | 147 -------------------------------------
 2 files changed, 148 deletions(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 1bbfaaea4539..9156132cd366 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,2 +1 @@
-DIST hydrus-515.tar.gz 41096030 BLAKE2B 47f09ef0b0a0c83960f7feadac28d14a051235a3f4601d6a0518b05c7c62ba4b0ec0093a474b232cc2bbca77c21579a69d963eb8372d7bab3d8ddd67a6067f1b SHA512 b8d330b546de1f8b4aa319783893d3fdfda7926faa05fd9494713e0a9f975b507eb1e42d56917a71721836162929f9bab78579f291aa72150f6e124c63bc259d
 DIST hydrus-516.tar.gz 41098992 BLAKE2B 4195ade87f9f42f5aaf592ae502e49404d3fb188f7921c137973e7df31af8bb346c243a375e99014cfa9e3d6821a187b254cfe79f88c470cf54aa45e50e9bb22 SHA512 941cb81fba305708a1c33250aae366ae3bf8ba83d9aab90475bec09109608c86b68fdcc84d18a4fe324f57b2b91b8531887d9792b9d9130c5234f9cfa96e106f

diff --git a/media-gfx/hydrus/hydrus-515.ebuild b/media-gfx/hydrus/hydrus-515.ebuild
deleted file mode 100644
index 6036cc0f1d38..000000000000
--- a/media-gfx/hydrus/hydrus-515.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-PYTHON_REQ_USE="sqlite"
-
-DOCS_BUILDER=mkdocs
-DOCS_DEPEND="dev-python/mkdocs-material dev-python/regex"
-
-inherit python-single-r1 desktop docs optfeature
-
-DESCRIPTION="A booru-like media organizer for the desktop"
-HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
-else
-	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-	KEYWORDS="~amd64"
-fi
-
-# hydrus itself is WTFPL
-# icons included are CC-BY-2.5
-LICENSE="WTFPL-2 CC-BY-2.5"
-SLOT="0"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-# RDEPEND is sorted as such:
-# - No specific requirements
-# - Specific version or slot
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/cbor2[${PYTHON_USEDEP}]
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cloudscraper[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},lcms]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
-		dev-python/python-mpv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/twisted[${PYTHON_USEDEP}]
-		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
-		media-video/ffmpeg
-
-		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	')
-"
-BDEPEND="
-	${RDEPEND}
-	$(python_gen_cond_dep '
-		test? (
-			dev-python/httmock[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-		)
-	')
-"
-
-PATCHES=(
-	"${FILESDIR}/userpath-in-local-share.patch"
-)
-
-src_prepare() {
-	default
-
-	# Contains pre-built binaries for other systems and a broken swf renderer for linux
-	rm -r bin/ || die
-	# Build files used for CI and development, not actually needed
-	rm -r static/build_files static/requirements || die
-	# Python requirements file, not needed
-	rm requirements.txt || die
-	# Remove unneeded additional scripts
-	rm *.command *.sh *.bat || die
-}
-
-src_compile() {
-	python_optimize "${S}"
-	docs_compile
-}
-
-src_test() {
-	# The tests use unittest, but are run with a custom runner script.
-	# QT_QPA_PLATFORM is required to make them run without X
-	local -x QT_QPA_PLATFORM=offscreen
-	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
-}
-
-src_install() {
-	local doc="${EPREFIX}/usr/share/doc/${PF}"
-	elog "Hydrus includes an excellent manual, that can either be viewed at"
-	elog "${doc}/html/help/index.html"
-	elog "or accessed through the hydrus help menu."
-
-	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
-
-	local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/)
-	einstalldocs
-
-	# Files only needed for testing
-	rm test.py hydrus/hydrus_test.py || die
-	rm -r hydrus/test/ static/testing/ || die
-
-	# ${DOCS[@]} files are copied into doc
-	# ${S}/docs/ is the markdown source code for documentation
-	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
-	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
-	if use doc; then
-		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
-		rm -r "${S}/_build" || die
-		# The program expects to find documentation here, so add a symlink to doc
-		dosym "${doc}/html" /opt/hydrus/help
-	fi
-
-	insinto /opt/hydrus
-	doins -r "${S}"/.
-
-	exeinto /usr/bin
-	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
-	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
-
-	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
-					   "AudioVideo;FileTools;Graphics;Network;"
-}
-
-pkg_postinst() {
-	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
-	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
-	optfeature "memory compression in the client" "dev-python/lz4"
-	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
-}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2023-03-11 17:15 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2023-03-11 17:15 UTC (permalink / raw
  To: gentoo-commits

commit:     f72be683c73e855445f685c0a289d1f30c172ec3
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Thu Mar  9 19:16:41 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 11 17:15:01 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f72be683

media-gfx/hydrus: Drop 516

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/Manifest          |   1 -
 media-gfx/hydrus/hydrus-516.ebuild | 147 -------------------------------------
 2 files changed, 148 deletions(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 37c23f2511ad..073b2a04a41a 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,3 +1,2 @@
 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-516.ebuild b/media-gfx/hydrus/hydrus-516.ebuild
deleted file mode 100644
index 6036cc0f1d38..000000000000
--- a/media-gfx/hydrus/hydrus-516.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-PYTHON_REQ_USE="sqlite"
-
-DOCS_BUILDER=mkdocs
-DOCS_DEPEND="dev-python/mkdocs-material dev-python/regex"
-
-inherit python-single-r1 desktop docs optfeature
-
-DESCRIPTION="A booru-like media organizer for the desktop"
-HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
-else
-	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-	KEYWORDS="~amd64"
-fi
-
-# hydrus itself is WTFPL
-# icons included are CC-BY-2.5
-LICENSE="WTFPL-2 CC-BY-2.5"
-SLOT="0"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-# RDEPEND is sorted as such:
-# - No specific requirements
-# - Specific version or slot
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/cbor2[${PYTHON_USEDEP}]
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cloudscraper[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},lcms]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
-		dev-python/python-mpv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/twisted[${PYTHON_USEDEP}]
-		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
-		media-video/ffmpeg
-
-		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	')
-"
-BDEPEND="
-	${RDEPEND}
-	$(python_gen_cond_dep '
-		test? (
-			dev-python/httmock[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-		)
-	')
-"
-
-PATCHES=(
-	"${FILESDIR}/userpath-in-local-share.patch"
-)
-
-src_prepare() {
-	default
-
-	# Contains pre-built binaries for other systems and a broken swf renderer for linux
-	rm -r bin/ || die
-	# Build files used for CI and development, not actually needed
-	rm -r static/build_files static/requirements || die
-	# Python requirements file, not needed
-	rm requirements.txt || die
-	# Remove unneeded additional scripts
-	rm *.command *.sh *.bat || die
-}
-
-src_compile() {
-	python_optimize "${S}"
-	docs_compile
-}
-
-src_test() {
-	# The tests use unittest, but are run with a custom runner script.
-	# QT_QPA_PLATFORM is required to make them run without X
-	local -x QT_QPA_PLATFORM=offscreen
-	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
-}
-
-src_install() {
-	local doc="${EPREFIX}/usr/share/doc/${PF}"
-	elog "Hydrus includes an excellent manual, that can either be viewed at"
-	elog "${doc}/html/help/index.html"
-	elog "or accessed through the hydrus help menu."
-
-	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
-
-	local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/)
-	einstalldocs
-
-	# Files only needed for testing
-	rm test.py hydrus/hydrus_test.py || die
-	rm -r hydrus/test/ static/testing/ || die
-
-	# ${DOCS[@]} files are copied into doc
-	# ${S}/docs/ is the markdown source code for documentation
-	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
-	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
-	if use doc; then
-		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
-		rm -r "${S}/_build" || die
-		# The program expects to find documentation here, so add a symlink to doc
-		dosym "${doc}/html" /opt/hydrus/help
-	fi
-
-	insinto /opt/hydrus
-	doins -r "${S}"/.
-
-	exeinto /usr/bin
-	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
-	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
-
-	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
-					   "AudioVideo;FileTools;Graphics;Network;"
-}
-
-pkg_postinst() {
-	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
-	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
-	optfeature "memory compression in the client" "dev-python/lz4"
-	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
-}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2023-03-11 17:15 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2023-03-11 17:15 UTC (permalink / raw
  To: gentoo-commits

commit:     8dfad257995828f0118b5d8bde6228a9a1c38165
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Thu Mar  9 19:17:05 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 11 17:15:01 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dfad257

media-gfx/hydrus: Add 519, update 9999

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://github.com/gentoo/gentoo/pull/30030
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/Manifest                                  | 1 +
 media-gfx/hydrus/{hydrus-9999.ebuild => hydrus-519.ebuild} | 7 +------
 media-gfx/hydrus/hydrus-9999.ebuild                        | 7 +------
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 073b2a04a41a..6c0a323628c1 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,2 +1,3 @@
 DIST hydrus-3.11-test-fixes.patch 8493 BLAKE2B 598c9a82ced8c181ac2c9f91bef34ad9136444f40d909a69c0c0d3a5f620bb2818a684ed221ae62f1e6226d6b534b6ac06cedb3f65a5f3be8fc2b12612a9daad SHA512 6dd8206b02f5f209cf86d2b8cd65952cc3d449352d3cb91c654d325077306415e6482191a4e64cba6aec2c4f1ff358c01e2ecbe7d3b56c9027673757a3590051
 DIST hydrus-518.tar.gz 41105373 BLAKE2B e766cdb7e8ffdc1148f5970724a6d3293522a0ae750c4e5c996d5cdbabc837dc3a9c002251080b6253a869b2cf87a17cb9c7b99ad912d68b6b5c4207e1d3ae7a SHA512 7e551ba83e97b490c98bf1858b87c78e9d5564cfaecfc83426ad2d802005e7cb84c9aadc61b762f3dca1916b8e786ca044bb310c93462e4c4f953f60f3291ed2
+DIST hydrus-519.tar.gz 41113296 BLAKE2B 7193fea1d0171af3799a33af68855bd67aa990802e110a3beec4f4f96597e78228e7ad169fce713bd91f862e48d973ca4acef88c204eb3c91f2cebf1d445cb16 SHA512 80abff327a8857d4fe311c4834016b46c45b6889e080675520998cfa196df2c97305368acada570c3a2ebd19caebb2e71c40f6ccd3d17912ad5f19cce09ceac7

diff --git a/media-gfx/hydrus/hydrus-9999.ebuild b/media-gfx/hydrus/hydrus-519.ebuild
similarity index 92%
copy from media-gfx/hydrus/hydrus-9999.ebuild
copy to media-gfx/hydrus/hydrus-519.ebuild
index 072c47dfe381..57ab39e51e10 100644
--- a/media-gfx/hydrus/hydrus-9999.ebuild
+++ b/media-gfx/hydrus/hydrus-519.ebuild
@@ -18,12 +18,8 @@ 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
-		https://github.com/vaartis/hydrus/commit/106a55b3aca945d047685eb53bd1d2aa8b8a7c50.diff -> ${PN}-3.11-test-fixes.patch
-	"
+	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 	KEYWORDS="~amd64"
 fi
@@ -79,7 +75,6 @@ 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 072c47dfe381..57ab39e51e10 100644
--- a/media-gfx/hydrus/hydrus-9999.ebuild
+++ b/media-gfx/hydrus/hydrus-9999.ebuild
@@ -18,12 +18,8 @@ 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
-		https://github.com/vaartis/hydrus/commit/106a55b3aca945d047685eb53bd1d2aa8b8a7c50.diff -> ${PN}-3.11-test-fixes.patch
-	"
+	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 	KEYWORDS="~amd64"
 fi
@@ -79,7 +75,6 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/userpath-in-local-share.patch"
-	"${DISTDIR}/${PN}-3.11-test-fixes.patch"
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2023-04-10  8:37 Joonas Niilola
  0 siblings, 0 replies; 104+ messages in thread
From: Joonas Niilola @ 2023-04-10  8:37 UTC (permalink / raw
  To: gentoo-commits

commit:     849e5b4d87022e0da06f94c8c8f27e99507af085
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Thu Mar 30 17:52:13 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Apr 10 08:37:41 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=849e5b4d

media-gfx/hydrus: Add 522

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/hydrus/Manifest          |   1 +
 media-gfx/hydrus/hydrus-522.ebuild | 147 +++++++++++++++++++++++++++++++++++++
 2 files changed, 148 insertions(+)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 6c0a323628c1..558d645cefab 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,3 +1,4 @@
 DIST hydrus-3.11-test-fixes.patch 8493 BLAKE2B 598c9a82ced8c181ac2c9f91bef34ad9136444f40d909a69c0c0d3a5f620bb2818a684ed221ae62f1e6226d6b534b6ac06cedb3f65a5f3be8fc2b12612a9daad SHA512 6dd8206b02f5f209cf86d2b8cd65952cc3d449352d3cb91c654d325077306415e6482191a4e64cba6aec2c4f1ff358c01e2ecbe7d3b56c9027673757a3590051
 DIST hydrus-518.tar.gz 41105373 BLAKE2B e766cdb7e8ffdc1148f5970724a6d3293522a0ae750c4e5c996d5cdbabc837dc3a9c002251080b6253a869b2cf87a17cb9c7b99ad912d68b6b5c4207e1d3ae7a SHA512 7e551ba83e97b490c98bf1858b87c78e9d5564cfaecfc83426ad2d802005e7cb84c9aadc61b762f3dca1916b8e786ca044bb310c93462e4c4f953f60f3291ed2
 DIST hydrus-519.tar.gz 41113296 BLAKE2B 7193fea1d0171af3799a33af68855bd67aa990802e110a3beec4f4f96597e78228e7ad169fce713bd91f862e48d973ca4acef88c204eb3c91f2cebf1d445cb16 SHA512 80abff327a8857d4fe311c4834016b46c45b6889e080675520998cfa196df2c97305368acada570c3a2ebd19caebb2e71c40f6ccd3d17912ad5f19cce09ceac7
+DIST hydrus-522.tar.gz 41149565 BLAKE2B 7306f1d275fb6cf4786f012eea8469c58eac8d9ee6392481cd92f791125dec5377f62dceb36005c24102771493e04b00f425579aad95cf5cfdb5310ff7de7c62 SHA512 adcf6c99d579e50248c81ca3016489c15aec8c3763f13634c50ed921b0fe7c974868b082bb2e5d26915ed877bc8df3b70af7e99549bdc177a3e9f46a50cce113

diff --git a/media-gfx/hydrus/hydrus-522.ebuild b/media-gfx/hydrus/hydrus-522.ebuild
new file mode 100644
index 000000000000..57ab39e51e10
--- /dev/null
+++ b/media-gfx/hydrus/hydrus-522.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="sqlite"
+
+DOCS_BUILDER=mkdocs
+DOCS_DEPEND="dev-python/mkdocs-material dev-python/regex"
+
+inherit python-single-r1 desktop docs optfeature
+
+DESCRIPTION="A booru-like media organizer for the desktop"
+HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
+else
+	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+# hydrus itself is WTFPL
+# icons included are CC-BY-2.5
+LICENSE="WTFPL-2 CC-BY-2.5"
+SLOT="0"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+# RDEPEND is sorted as such:
+# - No specific requirements
+# - Specific version or slot
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/cbor2[${PYTHON_USEDEP}]
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cloudscraper[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},lcms]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
+		dev-python/python-mpv[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/twisted[${PYTHON_USEDEP}]
+		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
+		media-video/ffmpeg
+
+		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	')
+"
+BDEPEND="
+	${RDEPEND}
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/httmock[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+		)
+	')
+"
+
+PATCHES=(
+	"${FILESDIR}/userpath-in-local-share.patch"
+)
+
+src_prepare() {
+	default
+
+	# Contains pre-built binaries for other systems and a broken swf renderer for linux
+	rm -r bin/ || die
+	# Build files used for CI and development, not actually needed
+	rm -r static/build_files static/requirements || die
+	# Python requirements file, not needed
+	rm requirements.txt || die
+	# Remove unneeded additional scripts
+	rm *.command *.sh *.bat || die
+}
+
+src_compile() {
+	python_optimize "${S}"
+	docs_compile
+}
+
+src_test() {
+	# The tests use unittest, but are run with a custom runner script.
+	# QT_QPA_PLATFORM is required to make them run without X
+	local -x QT_QPA_PLATFORM=offscreen
+	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
+}
+
+src_install() {
+	local doc="${EPREFIX}/usr/share/doc/${PF}"
+	elog "Hydrus includes an excellent manual, that can either be viewed at"
+	elog "${doc}/html/help/index.html"
+	elog "or accessed through the hydrus help menu."
+
+	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
+
+	local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/)
+	einstalldocs
+
+	# Files only needed for testing
+	rm test.py hydrus/hydrus_test.py || die
+	rm -r hydrus/test/ static/testing/ || die
+
+	# ${DOCS[@]} files are copied into doc
+	# ${S}/docs/ is the markdown source code for documentation
+	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
+	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
+	if use doc; then
+		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
+		rm -r "${S}/_build" || die
+		# The program expects to find documentation here, so add a symlink to doc
+		dosym "${doc}/html" /opt/hydrus/help
+	fi
+
+	insinto /opt/hydrus
+	doins -r "${S}"/.
+
+	exeinto /usr/bin
+	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
+	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
+
+	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
+					   "AudioVideo;FileTools;Graphics;Network;"
+}
+
+pkg_postinst() {
+	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
+	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
+	optfeature "memory compression in the client" "dev-python/lz4"
+	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
+}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2023-04-10  8:37 Joonas Niilola
  0 siblings, 0 replies; 104+ messages in thread
From: Joonas Niilola @ 2023-04-10  8:37 UTC (permalink / raw
  To: gentoo-commits

commit:     0b802cd9c06ab893f5d4df5e87a78cc8eaf434b8
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Thu Mar 30 17:52:29 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Apr 10 08:37:41 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b802cd9

media-gfx/hydrus: Remove 518

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://github.com/gentoo/gentoo/pull/30413
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/hydrus/Manifest          |   2 -
 media-gfx/hydrus/hydrus-518.ebuild | 152 -------------------------------------
 2 files changed, 154 deletions(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 558d645cefab..b7da688076c7 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,4 +1,2 @@
-DIST hydrus-3.11-test-fixes.patch 8493 BLAKE2B 598c9a82ced8c181ac2c9f91bef34ad9136444f40d909a69c0c0d3a5f620bb2818a684ed221ae62f1e6226d6b534b6ac06cedb3f65a5f3be8fc2b12612a9daad SHA512 6dd8206b02f5f209cf86d2b8cd65952cc3d449352d3cb91c654d325077306415e6482191a4e64cba6aec2c4f1ff358c01e2ecbe7d3b56c9027673757a3590051
-DIST hydrus-518.tar.gz 41105373 BLAKE2B e766cdb7e8ffdc1148f5970724a6d3293522a0ae750c4e5c996d5cdbabc837dc3a9c002251080b6253a869b2cf87a17cb9c7b99ad912d68b6b5c4207e1d3ae7a SHA512 7e551ba83e97b490c98bf1858b87c78e9d5564cfaecfc83426ad2d802005e7cb84c9aadc61b762f3dca1916b8e786ca044bb310c93462e4c4f953f60f3291ed2
 DIST hydrus-519.tar.gz 41113296 BLAKE2B 7193fea1d0171af3799a33af68855bd67aa990802e110a3beec4f4f96597e78228e7ad169fce713bd91f862e48d973ca4acef88c204eb3c91f2cebf1d445cb16 SHA512 80abff327a8857d4fe311c4834016b46c45b6889e080675520998cfa196df2c97305368acada570c3a2ebd19caebb2e71c40f6ccd3d17912ad5f19cce09ceac7
 DIST hydrus-522.tar.gz 41149565 BLAKE2B 7306f1d275fb6cf4786f012eea8469c58eac8d9ee6392481cd92f791125dec5377f62dceb36005c24102771493e04b00f425579aad95cf5cfdb5310ff7de7c62 SHA512 adcf6c99d579e50248c81ca3016489c15aec8c3763f13634c50ed921b0fe7c974868b082bb2e5d26915ed877bc8df3b70af7e99549bdc177a3e9f46a50cce113

diff --git a/media-gfx/hydrus/hydrus-518.ebuild b/media-gfx/hydrus/hydrus-518.ebuild
deleted file mode 100644
index 072c47dfe381..000000000000
--- a/media-gfx/hydrus/hydrus-518.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="sqlite"
-
-DOCS_BUILDER=mkdocs
-DOCS_DEPEND="dev-python/mkdocs-material dev-python/regex"
-
-inherit python-single-r1 desktop docs optfeature
-
-DESCRIPTION="A booru-like media organizer for the desktop"
-HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
-
-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
-		https://github.com/vaartis/hydrus/commit/106a55b3aca945d047685eb53bd1d2aa8b8a7c50.diff -> ${PN}-3.11-test-fixes.patch
-	"
-
-	KEYWORDS="~amd64"
-fi
-
-# hydrus itself is WTFPL
-# icons included are CC-BY-2.5
-LICENSE="WTFPL-2 CC-BY-2.5"
-SLOT="0"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-# RDEPEND is sorted as such:
-# - No specific requirements
-# - Specific version or slot
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/cbor2[${PYTHON_USEDEP}]
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cloudscraper[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},lcms]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
-		dev-python/python-mpv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/twisted[${PYTHON_USEDEP}]
-		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
-		media-video/ffmpeg
-
-		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	')
-"
-BDEPEND="
-	${RDEPEND}
-	$(python_gen_cond_dep '
-		test? (
-			dev-python/httmock[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-		)
-	')
-"
-
-PATCHES=(
-	"${FILESDIR}/userpath-in-local-share.patch"
-	"${DISTDIR}/${PN}-3.11-test-fixes.patch"
-)
-
-src_prepare() {
-	default
-
-	# Contains pre-built binaries for other systems and a broken swf renderer for linux
-	rm -r bin/ || die
-	# Build files used for CI and development, not actually needed
-	rm -r static/build_files static/requirements || die
-	# Python requirements file, not needed
-	rm requirements.txt || die
-	# Remove unneeded additional scripts
-	rm *.command *.sh *.bat || die
-}
-
-src_compile() {
-	python_optimize "${S}"
-	docs_compile
-}
-
-src_test() {
-	# The tests use unittest, but are run with a custom runner script.
-	# QT_QPA_PLATFORM is required to make them run without X
-	local -x QT_QPA_PLATFORM=offscreen
-	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
-}
-
-src_install() {
-	local doc="${EPREFIX}/usr/share/doc/${PF}"
-	elog "Hydrus includes an excellent manual, that can either be viewed at"
-	elog "${doc}/html/help/index.html"
-	elog "or accessed through the hydrus help menu."
-
-	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
-
-	local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/)
-	einstalldocs
-
-	# Files only needed for testing
-	rm test.py hydrus/hydrus_test.py || die
-	rm -r hydrus/test/ static/testing/ || die
-
-	# ${DOCS[@]} files are copied into doc
-	# ${S}/docs/ is the markdown source code for documentation
-	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
-	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
-	if use doc; then
-		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
-		rm -r "${S}/_build" || die
-		# The program expects to find documentation here, so add a symlink to doc
-		dosym "${doc}/html" /opt/hydrus/help
-	fi
-
-	insinto /opt/hydrus
-	doins -r "${S}"/.
-
-	exeinto /usr/bin
-	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
-	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
-
-	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
-					   "AudioVideo;FileTools;Graphics;Network;"
-}
-
-pkg_postinst() {
-	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
-	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
-	optfeature "memory compression in the client" "dev-python/lz4"
-	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
-}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2023-05-20  6:28 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2023-05-20  6:28 UTC (permalink / raw
  To: gentoo-commits

commit:     845c7956a21ce66c87f56157214ef03562fc898b
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Sat May  6 08:33:31 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 20 06:27:51 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=845c7956

media-gfx/hydrus: Drop 519

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/Manifest          |   1 -
 media-gfx/hydrus/hydrus-519.ebuild | 147 -------------------------------------
 2 files changed, 148 deletions(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index b7da688076c7..9071bf023b36 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,2 +1 @@
-DIST hydrus-519.tar.gz 41113296 BLAKE2B 7193fea1d0171af3799a33af68855bd67aa990802e110a3beec4f4f96597e78228e7ad169fce713bd91f862e48d973ca4acef88c204eb3c91f2cebf1d445cb16 SHA512 80abff327a8857d4fe311c4834016b46c45b6889e080675520998cfa196df2c97305368acada570c3a2ebd19caebb2e71c40f6ccd3d17912ad5f19cce09ceac7
 DIST hydrus-522.tar.gz 41149565 BLAKE2B 7306f1d275fb6cf4786f012eea8469c58eac8d9ee6392481cd92f791125dec5377f62dceb36005c24102771493e04b00f425579aad95cf5cfdb5310ff7de7c62 SHA512 adcf6c99d579e50248c81ca3016489c15aec8c3763f13634c50ed921b0fe7c974868b082bb2e5d26915ed877bc8df3b70af7e99549bdc177a3e9f46a50cce113

diff --git a/media-gfx/hydrus/hydrus-519.ebuild b/media-gfx/hydrus/hydrus-519.ebuild
deleted file mode 100644
index 57ab39e51e10..000000000000
--- a/media-gfx/hydrus/hydrus-519.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="sqlite"
-
-DOCS_BUILDER=mkdocs
-DOCS_DEPEND="dev-python/mkdocs-material dev-python/regex"
-
-inherit python-single-r1 desktop docs optfeature
-
-DESCRIPTION="A booru-like media organizer for the desktop"
-HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
-else
-	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-	KEYWORDS="~amd64"
-fi
-
-# hydrus itself is WTFPL
-# icons included are CC-BY-2.5
-LICENSE="WTFPL-2 CC-BY-2.5"
-SLOT="0"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-# RDEPEND is sorted as such:
-# - No specific requirements
-# - Specific version or slot
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/cbor2[${PYTHON_USEDEP}]
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cloudscraper[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},lcms]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
-		dev-python/python-mpv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/twisted[${PYTHON_USEDEP}]
-		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
-		media-video/ffmpeg
-
-		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	')
-"
-BDEPEND="
-	${RDEPEND}
-	$(python_gen_cond_dep '
-		test? (
-			dev-python/httmock[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-		)
-	')
-"
-
-PATCHES=(
-	"${FILESDIR}/userpath-in-local-share.patch"
-)
-
-src_prepare() {
-	default
-
-	# Contains pre-built binaries for other systems and a broken swf renderer for linux
-	rm -r bin/ || die
-	# Build files used for CI and development, not actually needed
-	rm -r static/build_files static/requirements || die
-	# Python requirements file, not needed
-	rm requirements.txt || die
-	# Remove unneeded additional scripts
-	rm *.command *.sh *.bat || die
-}
-
-src_compile() {
-	python_optimize "${S}"
-	docs_compile
-}
-
-src_test() {
-	# The tests use unittest, but are run with a custom runner script.
-	# QT_QPA_PLATFORM is required to make them run without X
-	local -x QT_QPA_PLATFORM=offscreen
-	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
-}
-
-src_install() {
-	local doc="${EPREFIX}/usr/share/doc/${PF}"
-	elog "Hydrus includes an excellent manual, that can either be viewed at"
-	elog "${doc}/html/help/index.html"
-	elog "or accessed through the hydrus help menu."
-
-	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
-
-	local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/)
-	einstalldocs
-
-	# Files only needed for testing
-	rm test.py hydrus/hydrus_test.py || die
-	rm -r hydrus/test/ static/testing/ || die
-
-	# ${DOCS[@]} files are copied into doc
-	# ${S}/docs/ is the markdown source code for documentation
-	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
-	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
-	if use doc; then
-		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
-		rm -r "${S}/_build" || die
-		# The program expects to find documentation here, so add a symlink to doc
-		dosym "${doc}/html" /opt/hydrus/help
-	fi
-
-	insinto /opt/hydrus
-	doins -r "${S}"/.
-
-	exeinto /usr/bin
-	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
-	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
-
-	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
-					   "AudioVideo;FileTools;Graphics;Network;"
-}
-
-pkg_postinst() {
-	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
-	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
-	optfeature "memory compression in the client" "dev-python/lz4"
-	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
-}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2023-05-20  6:28 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2023-05-20  6:28 UTC (permalink / raw
  To: gentoo-commits

commit:     3d98a339c18dc3a03532a10c57e8fca115d18db9
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Thu May 18 07:36:18 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 20 06:27:52 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d98a339

media-gfx/hydrus: Drop 522

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/Manifest          |   1 -
 media-gfx/hydrus/hydrus-522.ebuild | 147 -------------------------------------
 2 files changed, 148 deletions(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index af30ed83eafc..74a0905424a2 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,2 +1 @@
-DIST hydrus-522.tar.gz 41149565 BLAKE2B 7306f1d275fb6cf4786f012eea8469c58eac8d9ee6392481cd92f791125dec5377f62dceb36005c24102771493e04b00f425579aad95cf5cfdb5310ff7de7c62 SHA512 adcf6c99d579e50248c81ca3016489c15aec8c3763f13634c50ed921b0fe7c974868b082bb2e5d26915ed877bc8df3b70af7e99549bdc177a3e9f46a50cce113
 DIST hydrus-526.tar.gz 41182831 BLAKE2B cf41641625d6c8d64aeea78f56f643a39a6bf8030c919e0a83e5b7183ee7f5a03edef5574f67fb023c79e9e4d757e79f536d91d57ca8a097cc7c380075036c0b SHA512 ed8fff59563bbe8f8c3b235a188575be9d56aa5cf7e70cf340215a7af910247ba711061020f257dbdf1032b5d0ebd5e8995411f60ffe6b6ba9061d189b6274cd

diff --git a/media-gfx/hydrus/hydrus-522.ebuild b/media-gfx/hydrus/hydrus-522.ebuild
deleted file mode 100644
index 57ab39e51e10..000000000000
--- a/media-gfx/hydrus/hydrus-522.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="sqlite"
-
-DOCS_BUILDER=mkdocs
-DOCS_DEPEND="dev-python/mkdocs-material dev-python/regex"
-
-inherit python-single-r1 desktop docs optfeature
-
-DESCRIPTION="A booru-like media organizer for the desktop"
-HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
-else
-	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-	KEYWORDS="~amd64"
-fi
-
-# hydrus itself is WTFPL
-# icons included are CC-BY-2.5
-LICENSE="WTFPL-2 CC-BY-2.5"
-SLOT="0"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-# RDEPEND is sorted as such:
-# - No specific requirements
-# - Specific version or slot
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/cbor2[${PYTHON_USEDEP}]
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cloudscraper[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},lcms]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
-		dev-python/python-mpv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/twisted[${PYTHON_USEDEP}]
-		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
-		media-video/ffmpeg
-
-		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	')
-"
-BDEPEND="
-	${RDEPEND}
-	$(python_gen_cond_dep '
-		test? (
-			dev-python/httmock[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-		)
-	')
-"
-
-PATCHES=(
-	"${FILESDIR}/userpath-in-local-share.patch"
-)
-
-src_prepare() {
-	default
-
-	# Contains pre-built binaries for other systems and a broken swf renderer for linux
-	rm -r bin/ || die
-	# Build files used for CI and development, not actually needed
-	rm -r static/build_files static/requirements || die
-	# Python requirements file, not needed
-	rm requirements.txt || die
-	# Remove unneeded additional scripts
-	rm *.command *.sh *.bat || die
-}
-
-src_compile() {
-	python_optimize "${S}"
-	docs_compile
-}
-
-src_test() {
-	# The tests use unittest, but are run with a custom runner script.
-	# QT_QPA_PLATFORM is required to make them run without X
-	local -x QT_QPA_PLATFORM=offscreen
-	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
-}
-
-src_install() {
-	local doc="${EPREFIX}/usr/share/doc/${PF}"
-	elog "Hydrus includes an excellent manual, that can either be viewed at"
-	elog "${doc}/html/help/index.html"
-	elog "or accessed through the hydrus help menu."
-
-	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
-
-	local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/)
-	einstalldocs
-
-	# Files only needed for testing
-	rm test.py hydrus/hydrus_test.py || die
-	rm -r hydrus/test/ static/testing/ || die
-
-	# ${DOCS[@]} files are copied into doc
-	# ${S}/docs/ is the markdown source code for documentation
-	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
-	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
-	if use doc; then
-		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
-		rm -r "${S}/_build" || die
-		# The program expects to find documentation here, so add a symlink to doc
-		dosym "${doc}/html" /opt/hydrus/help
-	fi
-
-	insinto /opt/hydrus
-	doins -r "${S}"/.
-
-	exeinto /usr/bin
-	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
-	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
-
-	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
-					   "AudioVideo;FileTools;Graphics;Network;"
-}
-
-pkg_postinst() {
-	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
-	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
-	optfeature "memory compression in the client" "dev-python/lz4"
-	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
-}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2023-05-20  6:28 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2023-05-20  6:28 UTC (permalink / raw
  To: gentoo-commits

commit:     ef59bbf3dc470e1f13d64433af31a12ed852b653
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Sat May  6 08:33:46 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 20 06:27:52 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef59bbf3

media-gfx/hydrus: Add 526

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/Manifest          |   1 +
 media-gfx/hydrus/hydrus-526.ebuild | 147 +++++++++++++++++++++++++++++++++++++
 2 files changed, 148 insertions(+)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 9071bf023b36..af30ed83eafc 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1 +1,2 @@
 DIST hydrus-522.tar.gz 41149565 BLAKE2B 7306f1d275fb6cf4786f012eea8469c58eac8d9ee6392481cd92f791125dec5377f62dceb36005c24102771493e04b00f425579aad95cf5cfdb5310ff7de7c62 SHA512 adcf6c99d579e50248c81ca3016489c15aec8c3763f13634c50ed921b0fe7c974868b082bb2e5d26915ed877bc8df3b70af7e99549bdc177a3e9f46a50cce113
+DIST hydrus-526.tar.gz 41182831 BLAKE2B cf41641625d6c8d64aeea78f56f643a39a6bf8030c919e0a83e5b7183ee7f5a03edef5574f67fb023c79e9e4d757e79f536d91d57ca8a097cc7c380075036c0b SHA512 ed8fff59563bbe8f8c3b235a188575be9d56aa5cf7e70cf340215a7af910247ba711061020f257dbdf1032b5d0ebd5e8995411f60ffe6b6ba9061d189b6274cd

diff --git a/media-gfx/hydrus/hydrus-526.ebuild b/media-gfx/hydrus/hydrus-526.ebuild
new file mode 100644
index 000000000000..57ab39e51e10
--- /dev/null
+++ b/media-gfx/hydrus/hydrus-526.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="sqlite"
+
+DOCS_BUILDER=mkdocs
+DOCS_DEPEND="dev-python/mkdocs-material dev-python/regex"
+
+inherit python-single-r1 desktop docs optfeature
+
+DESCRIPTION="A booru-like media organizer for the desktop"
+HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
+else
+	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+# hydrus itself is WTFPL
+# icons included are CC-BY-2.5
+LICENSE="WTFPL-2 CC-BY-2.5"
+SLOT="0"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+# RDEPEND is sorted as such:
+# - No specific requirements
+# - Specific version or slot
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/cbor2[${PYTHON_USEDEP}]
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cloudscraper[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},lcms]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
+		dev-python/python-mpv[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/twisted[${PYTHON_USEDEP}]
+		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
+		media-video/ffmpeg
+
+		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	')
+"
+BDEPEND="
+	${RDEPEND}
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/httmock[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+		)
+	')
+"
+
+PATCHES=(
+	"${FILESDIR}/userpath-in-local-share.patch"
+)
+
+src_prepare() {
+	default
+
+	# Contains pre-built binaries for other systems and a broken swf renderer for linux
+	rm -r bin/ || die
+	# Build files used for CI and development, not actually needed
+	rm -r static/build_files static/requirements || die
+	# Python requirements file, not needed
+	rm requirements.txt || die
+	# Remove unneeded additional scripts
+	rm *.command *.sh *.bat || die
+}
+
+src_compile() {
+	python_optimize "${S}"
+	docs_compile
+}
+
+src_test() {
+	# The tests use unittest, but are run with a custom runner script.
+	# QT_QPA_PLATFORM is required to make them run without X
+	local -x QT_QPA_PLATFORM=offscreen
+	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
+}
+
+src_install() {
+	local doc="${EPREFIX}/usr/share/doc/${PF}"
+	elog "Hydrus includes an excellent manual, that can either be viewed at"
+	elog "${doc}/html/help/index.html"
+	elog "or accessed through the hydrus help menu."
+
+	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
+
+	local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/)
+	einstalldocs
+
+	# Files only needed for testing
+	rm test.py hydrus/hydrus_test.py || die
+	rm -r hydrus/test/ static/testing/ || die
+
+	# ${DOCS[@]} files are copied into doc
+	# ${S}/docs/ is the markdown source code for documentation
+	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
+	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
+	if use doc; then
+		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
+		rm -r "${S}/_build" || die
+		# The program expects to find documentation here, so add a symlink to doc
+		dosym "${doc}/html" /opt/hydrus/help
+	fi
+
+	insinto /opt/hydrus
+	doins -r "${S}"/.
+
+	exeinto /usr/bin
+	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
+	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
+
+	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
+					   "AudioVideo;FileTools;Graphics;Network;"
+}
+
+pkg_postinst() {
+	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
+	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
+	optfeature "memory compression in the client" "dev-python/lz4"
+	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
+}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2023-06-18 12:08 Joonas Niilola
  0 siblings, 0 replies; 104+ messages in thread
From: Joonas Niilola @ 2023-06-18 12:08 UTC (permalink / raw
  To: gentoo-commits

commit:     6cb97c9aba3fd8d69b66e6052284ed81bef187a1
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Thu Jun  8 07:58:11 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Jun 18 12:08:16 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cb97c9a

media-gfx/hydrus: Update 9999 to match the current ebuild

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://bugs.gentoo.org/908000
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/hydrus/hydrus-9999.ebuild | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/media-gfx/hydrus/hydrus-9999.ebuild b/media-gfx/hydrus/hydrus-9999.ebuild
index c78c948645a3..851d373d97a8 100644
--- a/media-gfx/hydrus/hydrus-9999.ebuild
+++ b/media-gfx/hydrus/hydrus-9999.ebuild
@@ -69,6 +69,8 @@ BDEPEND="
 		test? (
 			dev-python/httmock[${PYTHON_USEDEP}]
 			dev-python/mock[${PYTHON_USEDEP}]
+
+			dev-python/pyside2[widgets,gui,multimedia,${PYTHON_USEDEP}]
 		)
 	')
 "
@@ -82,8 +84,6 @@ src_prepare() {
 
 	# Contains pre-built binaries for other systems and a broken swf renderer for linux
 	rm -r bin/ || die
-	# Build files used for CI and development, not actually needed
-	rm -r static/build_files static/requirements || die
 	# Python requirements file, not needed
 	rm requirements.txt || die
 	# Remove unneeded additional scripts
@@ -99,7 +99,7 @@ src_test() {
 	# The tests use unittest, but are run with a custom runner script.
 	# QT_QPA_PLATFORM is required to make them run without X
 	local -x QT_QPA_PLATFORM=offscreen
-	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
+	"${EPYTHON}" "${S}/hydrus_test.py" || die "Tests failed"
 }
 
 src_install() {
@@ -114,8 +114,11 @@ src_install() {
 	einstalldocs
 
 	# Files only needed for testing
-	rm test.py hydrus/hydrus_test.py || die
+	rm hydrus_test.py hydrus/hydrus_test_boot.py || die
 	rm -r hydrus/test/ static/testing/ || die
+	# Build files used for CI and development, not actually needed. Has to be deleted after src_compile.
+	# because it contains documentation
+	rm -r static/build_files static/requirements || die
 
 	# ${DOCS[@]} files are copied into doc
 	# ${S}/docs/ is the markdown source code for documentation


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2023-06-18 12:08 Joonas Niilola
  0 siblings, 0 replies; 104+ messages in thread
From: Joonas Niilola @ 2023-06-18 12:08 UTC (permalink / raw
  To: gentoo-commits

commit:     2dcbad6888d0da9a3327a5e224260eeb706fb54f
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Thu Jun  8 08:00:35 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Jun 18 12:08:17 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dcbad68

media-gfx/hydrus: Drop 526

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/hydrus/Manifest          |   1 -
 media-gfx/hydrus/hydrus-526.ebuild | 147 -------------------------------------
 2 files changed, 148 deletions(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 3d788aac622b..9d378cc22778 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,2 +1 @@
-DIST hydrus-526.tar.gz 41182831 BLAKE2B cf41641625d6c8d64aeea78f56f643a39a6bf8030c919e0a83e5b7183ee7f5a03edef5574f67fb023c79e9e4d757e79f536d91d57ca8a097cc7c380075036c0b SHA512 ed8fff59563bbe8f8c3b235a188575be9d56aa5cf7e70cf340215a7af910247ba711061020f257dbdf1032b5d0ebd5e8995411f60ffe6b6ba9061d189b6274cd
 DIST hydrus-528.tar.gz 41492703 BLAKE2B 3e97e64a2bbdd513441c5ae34640779934057ec4bcea9ef806a3bbc053d5849af69eed79edca35b9b9f276bdc53c379c10a613b1efb7bb3e2e69dbcc4b210038 SHA512 b9c9069a92fd82c6c6137aeaf205c5cac2c34d31dce2174308c796e9289fc64b346eabb8ef55e2fef78ac0af73c1b8c14aa507f9d4508759e435ac7eb01400bb

diff --git a/media-gfx/hydrus/hydrus-526.ebuild b/media-gfx/hydrus/hydrus-526.ebuild
deleted file mode 100644
index c78c948645a3..000000000000
--- a/media-gfx/hydrus/hydrus-526.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="sqlite"
-
-DOCS_BUILDER=mkdocs
-DOCS_DEPEND="dev-python/mkdocs-material dev-python/regex"
-
-inherit python-single-r1 desktop docs optfeature
-
-DESCRIPTION="A booru-like media organizer for the desktop"
-HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
-else
-	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-	KEYWORDS="~amd64"
-fi
-
-# hydrus itself is WTFPL
-# icons included are CC-BY-2.5
-LICENSE="WTFPL-2 CC-BY-2.5"
-SLOT="0"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-# RDEPEND is sorted as such:
-# - No specific requirements
-# - Specific version or slot
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/cbor2[${PYTHON_USEDEP}]
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cloudscraper[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},lcms]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
-		dev-python/python-mpv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-		dev-python/service-identity[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/twisted[${PYTHON_USEDEP}]
-		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
-		media-video/ffmpeg
-
-		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	')
-"
-BDEPEND="
-	${RDEPEND}
-	$(python_gen_cond_dep '
-		test? (
-			dev-python/httmock[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-		)
-	')
-"
-
-PATCHES=(
-	"${FILESDIR}/userpath-in-local-share.patch"
-)
-
-src_prepare() {
-	default
-
-	# Contains pre-built binaries for other systems and a broken swf renderer for linux
-	rm -r bin/ || die
-	# Build files used for CI and development, not actually needed
-	rm -r static/build_files static/requirements || die
-	# Python requirements file, not needed
-	rm requirements.txt || die
-	# Remove unneeded additional scripts
-	rm *.command *.sh *.bat || die
-}
-
-src_compile() {
-	python_optimize "${S}"
-	docs_compile
-}
-
-src_test() {
-	# The tests use unittest, but are run with a custom runner script.
-	# QT_QPA_PLATFORM is required to make them run without X
-	local -x QT_QPA_PLATFORM=offscreen
-	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
-}
-
-src_install() {
-	local doc="${EPREFIX}/usr/share/doc/${PF}"
-	elog "Hydrus includes an excellent manual, that can either be viewed at"
-	elog "${doc}/html/help/index.html"
-	elog "or accessed through the hydrus help menu."
-
-	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
-
-	local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/)
-	einstalldocs
-
-	# Files only needed for testing
-	rm test.py hydrus/hydrus_test.py || die
-	rm -r hydrus/test/ static/testing/ || die
-
-	# ${DOCS[@]} files are copied into doc
-	# ${S}/docs/ is the markdown source code for documentation
-	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
-	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
-	if use doc; then
-		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
-		rm -r "${S}/_build" || die
-		# The program expects to find documentation here, so add a symlink to doc
-		dosym "${doc}/html" /opt/hydrus/help
-	fi
-
-	insinto /opt/hydrus
-	doins -r "${S}"/.
-
-	exeinto /usr/bin
-	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
-	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
-
-	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
-					   "AudioVideo;FileTools;Graphics;Network;"
-}
-
-pkg_postinst() {
-	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
-	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
-	optfeature "memory compression in the client" "dev-python/lz4"
-	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
-}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2023-06-18 12:08 Joonas Niilola
  0 siblings, 0 replies; 104+ messages in thread
From: Joonas Niilola @ 2023-06-18 12:08 UTC (permalink / raw
  To: gentoo-commits

commit:     209afa08150ca35ae80d7dc1ffbb2f51818b6b31
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Thu Jun  8 08:00:47 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Jun 18 12:08:17 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=209afa08

media-gfx/hydrus: Add 531

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://github.com/gentoo/gentoo/pull/31347
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/hydrus/Manifest          |   1 +
 media-gfx/hydrus/hydrus-531.ebuild | 150 +++++++++++++++++++++++++++++++++++++
 2 files changed, 151 insertions(+)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 9d378cc22778..dfc5e9c3fb1b 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1 +1,2 @@
 DIST hydrus-528.tar.gz 41492703 BLAKE2B 3e97e64a2bbdd513441c5ae34640779934057ec4bcea9ef806a3bbc053d5849af69eed79edca35b9b9f276bdc53c379c10a613b1efb7bb3e2e69dbcc4b210038 SHA512 b9c9069a92fd82c6c6137aeaf205c5cac2c34d31dce2174308c796e9289fc64b346eabb8ef55e2fef78ac0af73c1b8c14aa507f9d4508759e435ac7eb01400bb
+DIST hydrus-531.tar.gz 41507932 BLAKE2B 388bc87bedf46ce2e8b4a26bfe744a80382d2c87985950db4458834e4bb8acaa50d04c50d8321db6c35400079d88c6f8c62f68084f5b1d8503fa4c93e280b9bb SHA512 8083b37d7b99c9f5e2679d64e40bc90a2144878746454aea01d9548705c767889b3f895abde5d172a72e4edcaca1feca450ba2ed99389eecfc8467491dafac1c

diff --git a/media-gfx/hydrus/hydrus-531.ebuild b/media-gfx/hydrus/hydrus-531.ebuild
new file mode 100644
index 000000000000..851d373d97a8
--- /dev/null
+++ b/media-gfx/hydrus/hydrus-531.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="sqlite"
+
+DOCS_BUILDER=mkdocs
+DOCS_DEPEND="dev-python/mkdocs-material dev-python/regex"
+
+inherit python-single-r1 desktop docs optfeature
+
+DESCRIPTION="A booru-like media organizer for the desktop"
+HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
+else
+	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+# hydrus itself is WTFPL
+# icons included are CC-BY-2.5
+LICENSE="WTFPL-2 CC-BY-2.5"
+SLOT="0"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+# RDEPEND is sorted as such:
+# - No specific requirements
+# - Specific version or slot
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/cbor2[${PYTHON_USEDEP}]
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cloudscraper[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},lcms]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
+		dev-python/python-mpv[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+		dev-python/service-identity[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/twisted[${PYTHON_USEDEP}]
+		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
+		media-video/ffmpeg
+
+		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	')
+"
+BDEPEND="
+	${RDEPEND}
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/httmock[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+
+			dev-python/pyside2[widgets,gui,multimedia,${PYTHON_USEDEP}]
+		)
+	')
+"
+
+PATCHES=(
+	"${FILESDIR}/userpath-in-local-share.patch"
+)
+
+src_prepare() {
+	default
+
+	# Contains pre-built binaries for other systems and a broken swf renderer for linux
+	rm -r bin/ || die
+	# Python requirements file, not needed
+	rm requirements.txt || die
+	# Remove unneeded additional scripts
+	rm *.command *.sh *.bat || die
+}
+
+src_compile() {
+	python_optimize "${S}"
+	docs_compile
+}
+
+src_test() {
+	# The tests use unittest, but are run with a custom runner script.
+	# QT_QPA_PLATFORM is required to make them run without X
+	local -x QT_QPA_PLATFORM=offscreen
+	"${EPYTHON}" "${S}/hydrus_test.py" || die "Tests failed"
+}
+
+src_install() {
+	local doc="${EPREFIX}/usr/share/doc/${PF}"
+	elog "Hydrus includes an excellent manual, that can either be viewed at"
+	elog "${doc}/html/help/index.html"
+	elog "or accessed through the hydrus help menu."
+
+	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
+
+	local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/)
+	einstalldocs
+
+	# Files only needed for testing
+	rm hydrus_test.py hydrus/hydrus_test_boot.py || die
+	rm -r hydrus/test/ static/testing/ || die
+	# Build files used for CI and development, not actually needed. Has to be deleted after src_compile.
+	# because it contains documentation
+	rm -r static/build_files static/requirements || die
+
+	# ${DOCS[@]} files are copied into doc
+	# ${S}/docs/ is the markdown source code for documentation
+	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
+	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
+	if use doc; then
+		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
+		rm -r "${S}/_build" || die
+		# The program expects to find documentation here, so add a symlink to doc
+		dosym "${doc}/html" /opt/hydrus/help
+	fi
+
+	insinto /opt/hydrus
+	doins -r "${S}"/.
+
+	exeinto /usr/bin
+	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
+	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
+
+	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
+					   "AudioVideo;FileTools;Graphics;Network;"
+}
+
+pkg_postinst() {
+	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
+	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
+	optfeature "memory compression in the client" "dev-python/lz4"
+	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
+}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2023-07-26  3:02 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2023-07-26  3:02 UTC (permalink / raw
  To: gentoo-commits

commit:     4d7bdf524c6b606434efaa2b01100436eedea7bf
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Wed Jul 12 18:16:43 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 26 03:00:04 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d7bdf52

media-gfx/hydrus: Drop 528

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://github.com/gentoo/gentoo/pull/31854
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/Manifest          |   1 -
 media-gfx/hydrus/hydrus-528.ebuild | 150 -------------------------------------
 2 files changed, 151 deletions(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 898036a5bf1c..6382833b3b14 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,3 +1,2 @@
-DIST hydrus-528.tar.gz 41492703 BLAKE2B 3e97e64a2bbdd513441c5ae34640779934057ec4bcea9ef806a3bbc053d5849af69eed79edca35b9b9f276bdc53c379c10a613b1efb7bb3e2e69dbcc4b210038 SHA512 b9c9069a92fd82c6c6137aeaf205c5cac2c34d31dce2174308c796e9289fc64b346eabb8ef55e2fef78ac0af73c1b8c14aa507f9d4508759e435ac7eb01400bb
 DIST hydrus-531.tar.gz 41507932 BLAKE2B 388bc87bedf46ce2e8b4a26bfe744a80382d2c87985950db4458834e4bb8acaa50d04c50d8321db6c35400079d88c6f8c62f68084f5b1d8503fa4c93e280b9bb SHA512 8083b37d7b99c9f5e2679d64e40bc90a2144878746454aea01d9548705c767889b3f895abde5d172a72e4edcaca1feca450ba2ed99389eecfc8467491dafac1c
 DIST hydrus-534.tar.gz 41548094 BLAKE2B bec115deae4202869f34ed205d4b6f10b63b17fcb3d950250c1cfb2752f021c57487172deb0cebf29a349822d02ee520f3761320f49214ff8adcde7716eda984 SHA512 52f21ae2121fefd83efa2c0df8087fc6872fcb5a89ef1bab71ab968e148b51326f521dcc0f7636a45a9a9ce7661921402d1fc792de1f0c9251efb49e86cb08f7

diff --git a/media-gfx/hydrus/hydrus-528.ebuild b/media-gfx/hydrus/hydrus-528.ebuild
deleted file mode 100644
index 851d373d97a8..000000000000
--- a/media-gfx/hydrus/hydrus-528.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="sqlite"
-
-DOCS_BUILDER=mkdocs
-DOCS_DEPEND="dev-python/mkdocs-material dev-python/regex"
-
-inherit python-single-r1 desktop docs optfeature
-
-DESCRIPTION="A booru-like media organizer for the desktop"
-HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
-else
-	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-	KEYWORDS="~amd64"
-fi
-
-# hydrus itself is WTFPL
-# icons included are CC-BY-2.5
-LICENSE="WTFPL-2 CC-BY-2.5"
-SLOT="0"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-# RDEPEND is sorted as such:
-# - No specific requirements
-# - Specific version or slot
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/cbor2[${PYTHON_USEDEP}]
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cloudscraper[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},lcms]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
-		dev-python/python-mpv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-		dev-python/service-identity[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/twisted[${PYTHON_USEDEP}]
-		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
-		media-video/ffmpeg
-
-		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	')
-"
-BDEPEND="
-	${RDEPEND}
-	$(python_gen_cond_dep '
-		test? (
-			dev-python/httmock[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-
-			dev-python/pyside2[widgets,gui,multimedia,${PYTHON_USEDEP}]
-		)
-	')
-"
-
-PATCHES=(
-	"${FILESDIR}/userpath-in-local-share.patch"
-)
-
-src_prepare() {
-	default
-
-	# Contains pre-built binaries for other systems and a broken swf renderer for linux
-	rm -r bin/ || die
-	# Python requirements file, not needed
-	rm requirements.txt || die
-	# Remove unneeded additional scripts
-	rm *.command *.sh *.bat || die
-}
-
-src_compile() {
-	python_optimize "${S}"
-	docs_compile
-}
-
-src_test() {
-	# The tests use unittest, but are run with a custom runner script.
-	# QT_QPA_PLATFORM is required to make them run without X
-	local -x QT_QPA_PLATFORM=offscreen
-	"${EPYTHON}" "${S}/hydrus_test.py" || die "Tests failed"
-}
-
-src_install() {
-	local doc="${EPREFIX}/usr/share/doc/${PF}"
-	elog "Hydrus includes an excellent manual, that can either be viewed at"
-	elog "${doc}/html/help/index.html"
-	elog "or accessed through the hydrus help menu."
-
-	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
-
-	local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/)
-	einstalldocs
-
-	# Files only needed for testing
-	rm hydrus_test.py hydrus/hydrus_test_boot.py || die
-	rm -r hydrus/test/ static/testing/ || die
-	# Build files used for CI and development, not actually needed. Has to be deleted after src_compile.
-	# because it contains documentation
-	rm -r static/build_files static/requirements || die
-
-	# ${DOCS[@]} files are copied into doc
-	# ${S}/docs/ is the markdown source code for documentation
-	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
-	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
-	if use doc; then
-		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
-		rm -r "${S}/_build" || die
-		# The program expects to find documentation here, so add a symlink to doc
-		dosym "${doc}/html" /opt/hydrus/help
-	fi
-
-	insinto /opt/hydrus
-	doins -r "${S}"/.
-
-	exeinto /usr/bin
-	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
-	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
-
-	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
-					   "AudioVideo;FileTools;Graphics;Network;"
-}
-
-pkg_postinst() {
-	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
-	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
-	optfeature "memory compression in the client" "dev-python/lz4"
-	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
-}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2023-07-26  3:02 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2023-07-26  3:02 UTC (permalink / raw
  To: gentoo-commits

commit:     22a9ad4e68c2396e4095e4297c4784ed56338364
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Wed Jul 12 18:16:22 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 26 03:00:03 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22a9ad4e

media-gfx/hydrus: Add 534

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/Manifest          |   1 +
 media-gfx/hydrus/hydrus-534.ebuild | 150 +++++++++++++++++++++++++++++++++++++
 2 files changed, 151 insertions(+)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index dfc5e9c3fb1b..898036a5bf1c 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,2 +1,3 @@
 DIST hydrus-528.tar.gz 41492703 BLAKE2B 3e97e64a2bbdd513441c5ae34640779934057ec4bcea9ef806a3bbc053d5849af69eed79edca35b9b9f276bdc53c379c10a613b1efb7bb3e2e69dbcc4b210038 SHA512 b9c9069a92fd82c6c6137aeaf205c5cac2c34d31dce2174308c796e9289fc64b346eabb8ef55e2fef78ac0af73c1b8c14aa507f9d4508759e435ac7eb01400bb
 DIST hydrus-531.tar.gz 41507932 BLAKE2B 388bc87bedf46ce2e8b4a26bfe744a80382d2c87985950db4458834e4bb8acaa50d04c50d8321db6c35400079d88c6f8c62f68084f5b1d8503fa4c93e280b9bb SHA512 8083b37d7b99c9f5e2679d64e40bc90a2144878746454aea01d9548705c767889b3f895abde5d172a72e4edcaca1feca450ba2ed99389eecfc8467491dafac1c
+DIST hydrus-534.tar.gz 41548094 BLAKE2B bec115deae4202869f34ed205d4b6f10b63b17fcb3d950250c1cfb2752f021c57487172deb0cebf29a349822d02ee520f3761320f49214ff8adcde7716eda984 SHA512 52f21ae2121fefd83efa2c0df8087fc6872fcb5a89ef1bab71ab968e148b51326f521dcc0f7636a45a9a9ce7661921402d1fc792de1f0c9251efb49e86cb08f7

diff --git a/media-gfx/hydrus/hydrus-534.ebuild b/media-gfx/hydrus/hydrus-534.ebuild
new file mode 100644
index 000000000000..851d373d97a8
--- /dev/null
+++ b/media-gfx/hydrus/hydrus-534.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="sqlite"
+
+DOCS_BUILDER=mkdocs
+DOCS_DEPEND="dev-python/mkdocs-material dev-python/regex"
+
+inherit python-single-r1 desktop docs optfeature
+
+DESCRIPTION="A booru-like media organizer for the desktop"
+HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
+else
+	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+# hydrus itself is WTFPL
+# icons included are CC-BY-2.5
+LICENSE="WTFPL-2 CC-BY-2.5"
+SLOT="0"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+# RDEPEND is sorted as such:
+# - No specific requirements
+# - Specific version or slot
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/cbor2[${PYTHON_USEDEP}]
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cloudscraper[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},lcms]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
+		dev-python/python-mpv[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+		dev-python/service-identity[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/twisted[${PYTHON_USEDEP}]
+		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
+		media-video/ffmpeg
+
+		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	')
+"
+BDEPEND="
+	${RDEPEND}
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/httmock[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+
+			dev-python/pyside2[widgets,gui,multimedia,${PYTHON_USEDEP}]
+		)
+	')
+"
+
+PATCHES=(
+	"${FILESDIR}/userpath-in-local-share.patch"
+)
+
+src_prepare() {
+	default
+
+	# Contains pre-built binaries for other systems and a broken swf renderer for linux
+	rm -r bin/ || die
+	# Python requirements file, not needed
+	rm requirements.txt || die
+	# Remove unneeded additional scripts
+	rm *.command *.sh *.bat || die
+}
+
+src_compile() {
+	python_optimize "${S}"
+	docs_compile
+}
+
+src_test() {
+	# The tests use unittest, but are run with a custom runner script.
+	# QT_QPA_PLATFORM is required to make them run without X
+	local -x QT_QPA_PLATFORM=offscreen
+	"${EPYTHON}" "${S}/hydrus_test.py" || die "Tests failed"
+}
+
+src_install() {
+	local doc="${EPREFIX}/usr/share/doc/${PF}"
+	elog "Hydrus includes an excellent manual, that can either be viewed at"
+	elog "${doc}/html/help/index.html"
+	elog "or accessed through the hydrus help menu."
+
+	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
+
+	local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/)
+	einstalldocs
+
+	# Files only needed for testing
+	rm hydrus_test.py hydrus/hydrus_test_boot.py || die
+	rm -r hydrus/test/ static/testing/ || die
+	# Build files used for CI and development, not actually needed. Has to be deleted after src_compile.
+	# because it contains documentation
+	rm -r static/build_files static/requirements || die
+
+	# ${DOCS[@]} files are copied into doc
+	# ${S}/docs/ is the markdown source code for documentation
+	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
+	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
+	if use doc; then
+		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
+		rm -r "${S}/_build" || die
+		# The program expects to find documentation here, so add a symlink to doc
+		dosym "${doc}/html" /opt/hydrus/help
+	fi
+
+	insinto /opt/hydrus
+	doins -r "${S}"/.
+
+	exeinto /usr/bin
+	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
+	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
+
+	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
+					   "AudioVideo;FileTools;Graphics;Network;"
+}
+
+pkg_postinst() {
+	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
+	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
+	optfeature "memory compression in the client" "dev-python/lz4"
+	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
+}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2023-09-18 16:39 Joonas Niilola
  0 siblings, 0 replies; 104+ messages in thread
From: Joonas Niilola @ 2023-09-18 16:39 UTC (permalink / raw
  To: gentoo-commits

commit:     ec7debd151ca9b58ba1ec6e8cf88fc59a78a28ba
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Tue Aug 15 17:14:31 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Sep 18 16:39:49 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec7debd1

media-gfx/hydrus: Add 538

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://bugs.gentoo.org/912293
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/hydrus/Manifest          |   1 +
 media-gfx/hydrus/hydrus-538.ebuild | 149 +++++++++++++++++++++++++++++++++++++
 2 files changed, 150 insertions(+)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index e204dba72afe..415449bd1a83 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1 +1,2 @@
 DIST hydrus-534.tar.gz 41548094 BLAKE2B bec115deae4202869f34ed205d4b6f10b63b17fcb3d950250c1cfb2752f021c57487172deb0cebf29a349822d02ee520f3761320f49214ff8adcde7716eda984 SHA512 52f21ae2121fefd83efa2c0df8087fc6872fcb5a89ef1bab71ab968e148b51326f521dcc0f7636a45a9a9ce7661921402d1fc792de1f0c9251efb49e86cb08f7
+DIST hydrus-538.tar.gz 41659526 BLAKE2B 4e6f4058fc8eefb154ec08667d9d586e48df688de2e887bae05cc381dc15c56ba2da4a97d1194bac2547af24a690e8d6962f05792babb68a9f0d5fb9ca23047e SHA512 da7bebf294356455597d8397391edcd3c7af032ef2d494ed2e91277c58bd29516068ba9ed99fa5df8d7bbfc47beb3488b3d73a0d99cb946d57546b095b6d6cd6

diff --git a/media-gfx/hydrus/hydrus-538.ebuild b/media-gfx/hydrus/hydrus-538.ebuild
new file mode 100644
index 000000000000..6c1cb6719c2e
--- /dev/null
+++ b/media-gfx/hydrus/hydrus-538.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="sqlite"
+
+DOCS_BUILDER=mkdocs
+DOCS_DEPEND="dev-python/mkdocs-material dev-python/regex"
+
+inherit python-single-r1 desktop docs optfeature
+
+DESCRIPTION="A booru-like media organizer for the desktop"
+HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
+else
+	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+# hydrus itself is WTFPL
+# icons included are CC-BY-2.5
+LICENSE="WTFPL-2 CC-BY-2.5"
+SLOT="0"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+# RDEPEND is sorted as such:
+# Python libraries with no specific requirements
+# Python libraries with specific version, slot, or use requirements
+# Non-python dependencies
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		dev-python/cbor2[${PYTHON_USEDEP}]
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cloudscraper[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},lcms]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/python-mpv[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+		dev-python/service-identity[${PYTHON_USEDEP}]
+		dev-python/twisted[${PYTHON_USEDEP}]
+
+		dev-python/QtPy[widgets,gui,svg,multimedia,${PYTHON_USEDEP}]
+		|| ( dev-python/QtPy[pyside2] dev-python/QtPy[pyside6] )
+
+		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
+		media-video/ffmpeg
+	')
+"
+BDEPEND="
+	${RDEPEND}
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/httmock[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+		)
+	')
+"
+
+PATCHES=(
+	"${FILESDIR}/userpath-in-local-share.patch"
+)
+
+src_prepare() {
+	default
+
+	# Contains pre-built binaries for other systems and a broken swf renderer for linux
+	rm -r bin/ || die
+	# Python requirements file, not needed
+	rm requirements.txt || die
+	# Remove unneeded additional scripts
+	rm *.command *.sh *.bat || die
+}
+
+src_compile() {
+	python_optimize "${S}"
+	docs_compile
+}
+
+src_test() {
+	# The tests use unittest, but are run with a custom runner script.
+	# QT_QPA_PLATFORM is required to make them run without X
+	local -x QT_QPA_PLATFORM=offscreen
+	"${EPYTHON}" "${S}/hydrus_test.py" || die "Tests failed"
+}
+
+src_install() {
+	local doc="${EPREFIX}/usr/share/doc/${PF}"
+	elog "Hydrus includes an excellent manual, that can either be viewed at"
+	elog "${doc}/html/help/index.html"
+	elog "or accessed through the hydrus help menu."
+
+	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
+
+	local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/)
+	einstalldocs
+
+	# Files only needed for testing
+	rm hydrus_test.py hydrus/hydrus_test_boot.py || die
+	rm -r hydrus/test/ static/testing/ || die
+	# Build files used for CI and development, not actually needed. Has to be deleted after src_compile.
+	# because it contains documentation
+	rm -r static/build_files static/requirements || die
+
+	# ${DOCS[@]} files are copied into doc
+	# ${S}/docs/ is the markdown source code for documentation
+	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
+	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
+	if use doc; then
+		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
+		rm -r "${S}/_build" || die
+		# The program expects to find documentation here, so add a symlink to doc
+		dosym "${doc}/html" /opt/hydrus/help
+	fi
+
+	insinto /opt/hydrus
+	doins -r "${S}"/.
+
+	exeinto /usr/bin
+	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
+	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
+
+	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
+					   "AudioVideo;FileTools;Graphics;Network;"
+}
+
+pkg_postinst() {
+	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
+	optfeature "memory compression in the client" "dev-python/lz4"
+	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
+	optfeature "bandwidth charts support" "dev-python/pyside2[charts]" "dev-python/pyside6[charts]"
+}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2023-09-18 16:39 Joonas Niilola
  0 siblings, 0 replies; 104+ messages in thread
From: Joonas Niilola @ 2023-09-18 16:39 UTC (permalink / raw
  To: gentoo-commits

commit:     5d2ebd3d9a7d3dca111a19fe8dc3dd6b83526b5d
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Tue Aug 15 17:14:14 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Sep 18 16:39:49 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d2ebd3d

media-gfx/hydrus: Drop 531

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/hydrus/Manifest          |   1 -
 media-gfx/hydrus/hydrus-531.ebuild | 150 -------------------------------------
 2 files changed, 151 deletions(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 6382833b3b14..e204dba72afe 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,2 +1 @@
-DIST hydrus-531.tar.gz 41507932 BLAKE2B 388bc87bedf46ce2e8b4a26bfe744a80382d2c87985950db4458834e4bb8acaa50d04c50d8321db6c35400079d88c6f8c62f68084f5b1d8503fa4c93e280b9bb SHA512 8083b37d7b99c9f5e2679d64e40bc90a2144878746454aea01d9548705c767889b3f895abde5d172a72e4edcaca1feca450ba2ed99389eecfc8467491dafac1c
 DIST hydrus-534.tar.gz 41548094 BLAKE2B bec115deae4202869f34ed205d4b6f10b63b17fcb3d950250c1cfb2752f021c57487172deb0cebf29a349822d02ee520f3761320f49214ff8adcde7716eda984 SHA512 52f21ae2121fefd83efa2c0df8087fc6872fcb5a89ef1bab71ab968e148b51326f521dcc0f7636a45a9a9ce7661921402d1fc792de1f0c9251efb49e86cb08f7

diff --git a/media-gfx/hydrus/hydrus-531.ebuild b/media-gfx/hydrus/hydrus-531.ebuild
deleted file mode 100644
index 851d373d97a8..000000000000
--- a/media-gfx/hydrus/hydrus-531.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="sqlite"
-
-DOCS_BUILDER=mkdocs
-DOCS_DEPEND="dev-python/mkdocs-material dev-python/regex"
-
-inherit python-single-r1 desktop docs optfeature
-
-DESCRIPTION="A booru-like media organizer for the desktop"
-HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
-else
-	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-	KEYWORDS="~amd64"
-fi
-
-# hydrus itself is WTFPL
-# icons included are CC-BY-2.5
-LICENSE="WTFPL-2 CC-BY-2.5"
-SLOT="0"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-# RDEPEND is sorted as such:
-# - No specific requirements
-# - Specific version or slot
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/cbor2[${PYTHON_USEDEP}]
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cloudscraper[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},lcms]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
-		dev-python/python-mpv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-		dev-python/service-identity[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/twisted[${PYTHON_USEDEP}]
-		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
-		media-video/ffmpeg
-
-		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	')
-"
-BDEPEND="
-	${RDEPEND}
-	$(python_gen_cond_dep '
-		test? (
-			dev-python/httmock[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-
-			dev-python/pyside2[widgets,gui,multimedia,${PYTHON_USEDEP}]
-		)
-	')
-"
-
-PATCHES=(
-	"${FILESDIR}/userpath-in-local-share.patch"
-)
-
-src_prepare() {
-	default
-
-	# Contains pre-built binaries for other systems and a broken swf renderer for linux
-	rm -r bin/ || die
-	# Python requirements file, not needed
-	rm requirements.txt || die
-	# Remove unneeded additional scripts
-	rm *.command *.sh *.bat || die
-}
-
-src_compile() {
-	python_optimize "${S}"
-	docs_compile
-}
-
-src_test() {
-	# The tests use unittest, but are run with a custom runner script.
-	# QT_QPA_PLATFORM is required to make them run without X
-	local -x QT_QPA_PLATFORM=offscreen
-	"${EPYTHON}" "${S}/hydrus_test.py" || die "Tests failed"
-}
-
-src_install() {
-	local doc="${EPREFIX}/usr/share/doc/${PF}"
-	elog "Hydrus includes an excellent manual, that can either be viewed at"
-	elog "${doc}/html/help/index.html"
-	elog "or accessed through the hydrus help menu."
-
-	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
-
-	local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/)
-	einstalldocs
-
-	# Files only needed for testing
-	rm hydrus_test.py hydrus/hydrus_test_boot.py || die
-	rm -r hydrus/test/ static/testing/ || die
-	# Build files used for CI and development, not actually needed. Has to be deleted after src_compile.
-	# because it contains documentation
-	rm -r static/build_files static/requirements || die
-
-	# ${DOCS[@]} files are copied into doc
-	# ${S}/docs/ is the markdown source code for documentation
-	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
-	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
-	if use doc; then
-		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
-		rm -r "${S}/_build" || die
-		# The program expects to find documentation here, so add a symlink to doc
-		dosym "${doc}/html" /opt/hydrus/help
-	fi
-
-	insinto /opt/hydrus
-	doins -r "${S}"/.
-
-	exeinto /usr/bin
-	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
-	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
-
-	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
-					   "AudioVideo;FileTools;Graphics;Network;"
-}
-
-pkg_postinst() {
-	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
-	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
-	optfeature "memory compression in the client" "dev-python/lz4"
-	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
-}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2023-09-18 16:39 Joonas Niilola
  0 siblings, 0 replies; 104+ messages in thread
From: Joonas Niilola @ 2023-09-18 16:39 UTC (permalink / raw
  To: gentoo-commits

commit:     a6360b5dbc79543a3ffb692e736dcc9705e39ace
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Tue Aug 15 17:16:58 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Sep 18 16:39:49 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6360b5d

media-gfx/hydrus: Update 9999

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://github.com/gentoo/gentoo/pull/32330
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/hydrus/hydrus-9999.ebuild | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/media-gfx/hydrus/hydrus-9999.ebuild b/media-gfx/hydrus/hydrus-9999.ebuild
index 851d373d97a8..6c1cb6719c2e 100644
--- a/media-gfx/hydrus/hydrus-9999.ebuild
+++ b/media-gfx/hydrus/hydrus-9999.ebuild
@@ -34,11 +34,13 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 
 # RDEPEND is sorted as such:
-# - No specific requirements
-# - Specific version or slot
+# Python libraries with no specific requirements
+# Python libraries with specific version, slot, or use requirements
+# Non-python dependencies
 RDEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/cbor2[${PYTHON_USEDEP}]
 		dev-python/chardet[${PYTHON_USEDEP}]
 		dev-python/cloudscraper[${PYTHON_USEDEP}]
@@ -48,19 +50,18 @@ RDEPEND="
 		dev-python/pillow[${PYTHON_USEDEP},lcms]
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
 		dev-python/python-mpv[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/send2trash[${PYTHON_USEDEP}]
 		dev-python/service-identity[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
 		dev-python/twisted[${PYTHON_USEDEP}]
+
+		dev-python/QtPy[widgets,gui,svg,multimedia,${PYTHON_USEDEP}]
+		|| ( dev-python/QtPy[pyside2] dev-python/QtPy[pyside6] )
+
 		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
 		media-video/ffmpeg
-
-		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	')
 "
 BDEPEND="
@@ -69,8 +70,6 @@ BDEPEND="
 		test? (
 			dev-python/httmock[${PYTHON_USEDEP}]
 			dev-python/mock[${PYTHON_USEDEP}]
-
-			dev-python/pyside2[widgets,gui,multimedia,${PYTHON_USEDEP}]
 		)
 	')
 "
@@ -144,7 +143,7 @@ src_install() {
 
 pkg_postinst() {
 	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
-	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
 	optfeature "memory compression in the client" "dev-python/lz4"
 	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
+	optfeature "bandwidth charts support" "dev-python/pyside2[charts]" "dev-python/pyside6[charts]"
 }


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2024-03-12  9:54 Joonas Niilola
  0 siblings, 0 replies; 104+ messages in thread
From: Joonas Niilola @ 2024-03-12  9:54 UTC (permalink / raw
  To: gentoo-commits

commit:     5df3d3532f4b2412c4c3aa514a849ed11251d4d5
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Mon Mar 11 07:39:57 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Mar 12 09:54:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5df3d353

media-gfx/hydrus: Drop 538

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/hydrus/Manifest          |   1 -
 media-gfx/hydrus/hydrus-538.ebuild | 149 -------------------------------------
 2 files changed, 150 deletions(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index b4c0dab942bf..7cc186a66dc2 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,3 +1,2 @@
 DIST 3500-mpeg-error.patch 1630 BLAKE2B d0d5cc7ee34d7615361890f9e51630ee7a4b93b6f477f991113d2ae8e35f4a83a7ce5075da10157f83f2e182fb83efb8d548d79b0724aa6942238e31fe56d6e8 SHA512 4e929b09ed8a52c31063f5a34ea84ae81ad8bb75c9e1ea5ab7ce8a99b993e562d3ff35f69ea50720b03366114d1ba2954c3a0a8de70805364a50b06fdd62af8c
-DIST hydrus-538.tar.gz 41659526 BLAKE2B 4e6f4058fc8eefb154ec08667d9d586e48df688de2e887bae05cc381dc15c56ba2da4a97d1194bac2547af24a690e8d6962f05792babb68a9f0d5fb9ca23047e SHA512 da7bebf294356455597d8397391edcd3c7af032ef2d494ed2e91277c58bd29516068ba9ed99fa5df8d7bbfc47beb3488b3d73a0d99cb946d57546b095b6d6cd6
 DIST hydrus-553.tar.gz 45244801 BLAKE2B 4d4133a134d6ea07a4ee4a611a25946d8b16081be827618c6bbd93cb660e34fae60c88881ef85b3ce7f8d48ad251609a9ce895c089baba17018f001f427c99d5 SHA512 ae50e056e9c7faf43da98ceff163c246cc09a33b5d659fb1963b693e00c566b35b39cfe15dcd0e4e0c2e998dc5dc4e198ffe1549696b7c9b97ab639934924d2f

diff --git a/media-gfx/hydrus/hydrus-538.ebuild b/media-gfx/hydrus/hydrus-538.ebuild
deleted file mode 100644
index 6c1cb6719c2e..000000000000
--- a/media-gfx/hydrus/hydrus-538.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="sqlite"
-
-DOCS_BUILDER=mkdocs
-DOCS_DEPEND="dev-python/mkdocs-material dev-python/regex"
-
-inherit python-single-r1 desktop docs optfeature
-
-DESCRIPTION="A booru-like media organizer for the desktop"
-HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
-else
-	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-	KEYWORDS="~amd64"
-fi
-
-# hydrus itself is WTFPL
-# icons included are CC-BY-2.5
-LICENSE="WTFPL-2 CC-BY-2.5"
-SLOT="0"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-# RDEPEND is sorted as such:
-# Python libraries with no specific requirements
-# Python libraries with specific version, slot, or use requirements
-# Non-python dependencies
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/cbor2[${PYTHON_USEDEP}]
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cloudscraper[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},lcms]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/python-mpv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-		dev-python/service-identity[${PYTHON_USEDEP}]
-		dev-python/twisted[${PYTHON_USEDEP}]
-
-		dev-python/QtPy[widgets,gui,svg,multimedia,${PYTHON_USEDEP}]
-		|| ( dev-python/QtPy[pyside2] dev-python/QtPy[pyside6] )
-
-		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
-		media-video/ffmpeg
-	')
-"
-BDEPEND="
-	${RDEPEND}
-	$(python_gen_cond_dep '
-		test? (
-			dev-python/httmock[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-		)
-	')
-"
-
-PATCHES=(
-	"${FILESDIR}/userpath-in-local-share.patch"
-)
-
-src_prepare() {
-	default
-
-	# Contains pre-built binaries for other systems and a broken swf renderer for linux
-	rm -r bin/ || die
-	# Python requirements file, not needed
-	rm requirements.txt || die
-	# Remove unneeded additional scripts
-	rm *.command *.sh *.bat || die
-}
-
-src_compile() {
-	python_optimize "${S}"
-	docs_compile
-}
-
-src_test() {
-	# The tests use unittest, but are run with a custom runner script.
-	# QT_QPA_PLATFORM is required to make them run without X
-	local -x QT_QPA_PLATFORM=offscreen
-	"${EPYTHON}" "${S}/hydrus_test.py" || die "Tests failed"
-}
-
-src_install() {
-	local doc="${EPREFIX}/usr/share/doc/${PF}"
-	elog "Hydrus includes an excellent manual, that can either be viewed at"
-	elog "${doc}/html/help/index.html"
-	elog "or accessed through the hydrus help menu."
-
-	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
-
-	local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/)
-	einstalldocs
-
-	# Files only needed for testing
-	rm hydrus_test.py hydrus/hydrus_test_boot.py || die
-	rm -r hydrus/test/ static/testing/ || die
-	# Build files used for CI and development, not actually needed. Has to be deleted after src_compile.
-	# because it contains documentation
-	rm -r static/build_files static/requirements || die
-
-	# ${DOCS[@]} files are copied into doc
-	# ${S}/docs/ is the markdown source code for documentation
-	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
-	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
-	if use doc; then
-		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
-		rm -r "${S}/_build" || die
-		# The program expects to find documentation here, so add a symlink to doc
-		dosym "${doc}/html" /opt/hydrus/help
-	fi
-
-	insinto /opt/hydrus
-	doins -r "${S}"/.
-
-	exeinto /usr/bin
-	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
-	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
-
-	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
-					   "AudioVideo;FileTools;Graphics;Network;"
-}
-
-pkg_postinst() {
-	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
-	optfeature "memory compression in the client" "dev-python/lz4"
-	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
-	optfeature "bandwidth charts support" "dev-python/pyside2[charts]" "dev-python/pyside6[charts]"
-}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2024-03-12  9:54 Joonas Niilola
  0 siblings, 0 replies; 104+ messages in thread
From: Joonas Niilola @ 2024-03-12  9:54 UTC (permalink / raw
  To: gentoo-commits

commit:     2fdd24e717e3fd5eb130b283450ca74971a9e7cc
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Mon Mar 11 07:41:00 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Mar 12 09:54:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fdd24e7

media-gfx/hydrus: Drop 553

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/hydrus/Manifest          |   2 -
 media-gfx/hydrus/hydrus-553.ebuild | 153 -------------------------------------
 2 files changed, 155 deletions(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 7cc186a66dc2..e69de29bb2d1 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,2 +0,0 @@
-DIST 3500-mpeg-error.patch 1630 BLAKE2B d0d5cc7ee34d7615361890f9e51630ee7a4b93b6f477f991113d2ae8e35f4a83a7ce5075da10157f83f2e182fb83efb8d548d79b0724aa6942238e31fe56d6e8 SHA512 4e929b09ed8a52c31063f5a34ea84ae81ad8bb75c9e1ea5ab7ce8a99b993e562d3ff35f69ea50720b03366114d1ba2954c3a0a8de70805364a50b06fdd62af8c
-DIST hydrus-553.tar.gz 45244801 BLAKE2B 4d4133a134d6ea07a4ee4a611a25946d8b16081be827618c6bbd93cb660e34fae60c88881ef85b3ce7f8d48ad251609a9ce895c089baba17018f001f427c99d5 SHA512 ae50e056e9c7faf43da98ceff163c246cc09a33b5d659fb1963b693e00c566b35b39cfe15dcd0e4e0c2e998dc5dc4e198ffe1549696b7c9b97ab639934924d2f

diff --git a/media-gfx/hydrus/hydrus-553.ebuild b/media-gfx/hydrus/hydrus-553.ebuild
deleted file mode 100644
index aae4cae9e374..000000000000
--- a/media-gfx/hydrus/hydrus-553.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="sqlite"
-
-DOCS_BUILDER=mkdocs
-DOCS_DEPEND="dev-python/mkdocs-material dev-python/regex"
-
-inherit python-single-r1 desktop docs optfeature
-
-DESCRIPTION="A booru-like media organizer for the desktop"
-HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
-else
-	SRC_URI="
-		https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		https://github.com/vaartis/hydrus/commit/5d2505a1eb4721f7750861f7622c46adec31db8b.diff -> 3500-mpeg-error.patch
-"
-
-	KEYWORDS="~amd64"
-fi
-
-# hydrus itself is WTFPL
-# icons included are CC-BY-2.5
-LICENSE="WTFPL-2 CC-BY-2.5"
-SLOT="0"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-# RDEPEND is sorted as such:
-# Python libraries with no specific requirements
-# Python libraries with specific version, slot, or use requirements
-# Non-python dependencies
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/cbor2[${PYTHON_USEDEP}]
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cloudscraper[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},lcms]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/python-mpv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-		dev-python/service-identity[${PYTHON_USEDEP}]
-		dev-python/twisted[${PYTHON_USEDEP}]
-
-		dev-python/QtPy[widgets,gui,svg,multimedia,${PYTHON_USEDEP}]
-		|| ( dev-python/QtPy[pyside2] dev-python/QtPy[pyside6] )
-
-		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
-		media-video/ffmpeg
-	')
-"
-BDEPEND="
-	${RDEPEND}
-	$(python_gen_cond_dep '
-		test? (
-			dev-python/httmock[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-		)
-	')
-"
-
-PATCHES=(
-	"${FILESDIR}/userpath-in-local-share.patch"
-	"${DISTDIR}/3500-mpeg-error.patch"
-)
-
-src_prepare() {
-	default
-
-	# Contains pre-built binaries for other systems and a broken swf renderer for linux
-	rm -r bin/ || die
-	# Python requirements file, not needed
-	rm requirements.txt || die
-	# Remove unneeded additional scripts
-	rm *.command *.sh *.bat || die
-}
-
-src_compile() {
-	python_optimize "${S}"
-	docs_compile
-}
-
-src_test() {
-	# The tests use unittest, but are run with a custom runner script.
-	# QT_QPA_PLATFORM is required to make them run without X
-	local -x QT_QPA_PLATFORM=offscreen
-	"${EPYTHON}" "${S}/hydrus_test.py" || die "Tests failed"
-}
-
-src_install() {
-	local doc="${EPREFIX}/usr/share/doc/${PF}"
-	elog "Hydrus includes an excellent manual, that can either be viewed at"
-	elog "${doc}/html/help/index.html"
-	elog "or accessed through the hydrus help menu."
-
-	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
-
-	local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/)
-	einstalldocs
-
-	# Files only needed for testing
-	rm hydrus_test.py hydrus/hydrus_test_boot.py || die
-	rm -r hydrus/test/ static/testing/ || die
-	# Build files used for CI and development, not actually needed. Has to be deleted after src_compile.
-	# because it contains documentation
-	rm -r static/build_files static/requirements || die
-
-	# ${DOCS[@]} files are copied into doc
-	# ${S}/docs/ is the markdown source code for documentation
-	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
-	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
-	if use doc; then
-		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
-		rm -r "${S}/_build" || die
-		# The program expects to find documentation here, so add a symlink to doc
-		dosym "${doc}/html" /opt/hydrus/help
-	fi
-
-	insinto /opt/hydrus
-	doins -r "${S}"/.
-
-	exeinto /usr/bin
-	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
-	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
-
-	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
-					   "AudioVideo;FileTools;Graphics;Network;"
-}
-
-pkg_postinst() {
-	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
-	optfeature "memory compression in the client" "dev-python/lz4"
-	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
-	optfeature "bandwidth charts support" "dev-python/pyside2[charts]" "dev-python/pyside6[charts]"
-}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2024-03-12  9:54 Joonas Niilola
  0 siblings, 0 replies; 104+ messages in thread
From: Joonas Niilola @ 2024-03-12  9:54 UTC (permalink / raw
  To: gentoo-commits

commit:     a70cc5184b5fb5f5708c9fedc462e3cb8f90c505
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Tue Nov 28 20:07:23 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Mar 12 09:54:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a70cc518

media-gfx/hydrus: Add 553

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/hydrus/Manifest          |   2 +
 media-gfx/hydrus/hydrus-553.ebuild | 153 +++++++++++++++++++++++++++++++++++++
 2 files changed, 155 insertions(+)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index e44d3683a5a0..b4c0dab942bf 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1 +1,3 @@
+DIST 3500-mpeg-error.patch 1630 BLAKE2B d0d5cc7ee34d7615361890f9e51630ee7a4b93b6f477f991113d2ae8e35f4a83a7ce5075da10157f83f2e182fb83efb8d548d79b0724aa6942238e31fe56d6e8 SHA512 4e929b09ed8a52c31063f5a34ea84ae81ad8bb75c9e1ea5ab7ce8a99b993e562d3ff35f69ea50720b03366114d1ba2954c3a0a8de70805364a50b06fdd62af8c
 DIST hydrus-538.tar.gz 41659526 BLAKE2B 4e6f4058fc8eefb154ec08667d9d586e48df688de2e887bae05cc381dc15c56ba2da4a97d1194bac2547af24a690e8d6962f05792babb68a9f0d5fb9ca23047e SHA512 da7bebf294356455597d8397391edcd3c7af032ef2d494ed2e91277c58bd29516068ba9ed99fa5df8d7bbfc47beb3488b3d73a0d99cb946d57546b095b6d6cd6
+DIST hydrus-553.tar.gz 45244801 BLAKE2B 4d4133a134d6ea07a4ee4a611a25946d8b16081be827618c6bbd93cb660e34fae60c88881ef85b3ce7f8d48ad251609a9ce895c089baba17018f001f427c99d5 SHA512 ae50e056e9c7faf43da98ceff163c246cc09a33b5d659fb1963b693e00c566b35b39cfe15dcd0e4e0c2e998dc5dc4e198ffe1549696b7c9b97ab639934924d2f

diff --git a/media-gfx/hydrus/hydrus-553.ebuild b/media-gfx/hydrus/hydrus-553.ebuild
new file mode 100644
index 000000000000..aae4cae9e374
--- /dev/null
+++ b/media-gfx/hydrus/hydrus-553.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="sqlite"
+
+DOCS_BUILDER=mkdocs
+DOCS_DEPEND="dev-python/mkdocs-material dev-python/regex"
+
+inherit python-single-r1 desktop docs optfeature
+
+DESCRIPTION="A booru-like media organizer for the desktop"
+HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
+else
+	SRC_URI="
+		https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/vaartis/hydrus/commit/5d2505a1eb4721f7750861f7622c46adec31db8b.diff -> 3500-mpeg-error.patch
+"
+
+	KEYWORDS="~amd64"
+fi
+
+# hydrus itself is WTFPL
+# icons included are CC-BY-2.5
+LICENSE="WTFPL-2 CC-BY-2.5"
+SLOT="0"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+# RDEPEND is sorted as such:
+# Python libraries with no specific requirements
+# Python libraries with specific version, slot, or use requirements
+# Non-python dependencies
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		dev-python/cbor2[${PYTHON_USEDEP}]
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cloudscraper[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},lcms]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/python-mpv[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+		dev-python/service-identity[${PYTHON_USEDEP}]
+		dev-python/twisted[${PYTHON_USEDEP}]
+
+		dev-python/QtPy[widgets,gui,svg,multimedia,${PYTHON_USEDEP}]
+		|| ( dev-python/QtPy[pyside2] dev-python/QtPy[pyside6] )
+
+		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
+		media-video/ffmpeg
+	')
+"
+BDEPEND="
+	${RDEPEND}
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/httmock[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+		)
+	')
+"
+
+PATCHES=(
+	"${FILESDIR}/userpath-in-local-share.patch"
+	"${DISTDIR}/3500-mpeg-error.patch"
+)
+
+src_prepare() {
+	default
+
+	# Contains pre-built binaries for other systems and a broken swf renderer for linux
+	rm -r bin/ || die
+	# Python requirements file, not needed
+	rm requirements.txt || die
+	# Remove unneeded additional scripts
+	rm *.command *.sh *.bat || die
+}
+
+src_compile() {
+	python_optimize "${S}"
+	docs_compile
+}
+
+src_test() {
+	# The tests use unittest, but are run with a custom runner script.
+	# QT_QPA_PLATFORM is required to make them run without X
+	local -x QT_QPA_PLATFORM=offscreen
+	"${EPYTHON}" "${S}/hydrus_test.py" || die "Tests failed"
+}
+
+src_install() {
+	local doc="${EPREFIX}/usr/share/doc/${PF}"
+	elog "Hydrus includes an excellent manual, that can either be viewed at"
+	elog "${doc}/html/help/index.html"
+	elog "or accessed through the hydrus help menu."
+
+	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
+
+	local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/)
+	einstalldocs
+
+	# Files only needed for testing
+	rm hydrus_test.py hydrus/hydrus_test_boot.py || die
+	rm -r hydrus/test/ static/testing/ || die
+	# Build files used for CI and development, not actually needed. Has to be deleted after src_compile.
+	# because it contains documentation
+	rm -r static/build_files static/requirements || die
+
+	# ${DOCS[@]} files are copied into doc
+	# ${S}/docs/ is the markdown source code for documentation
+	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
+	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
+	if use doc; then
+		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
+		rm -r "${S}/_build" || die
+		# The program expects to find documentation here, so add a symlink to doc
+		dosym "${doc}/html" /opt/hydrus/help
+	fi
+
+	insinto /opt/hydrus
+	doins -r "${S}"/.
+
+	exeinto /usr/bin
+	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
+	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
+
+	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
+					   "AudioVideo;FileTools;Graphics;Network;"
+}
+
+pkg_postinst() {
+	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
+	optfeature "memory compression in the client" "dev-python/lz4"
+	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
+	optfeature "bandwidth charts support" "dev-python/pyside2[charts]" "dev-python/pyside6[charts]"
+}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2024-03-12  9:54 Joonas Niilola
  0 siblings, 0 replies; 104+ messages in thread
From: Joonas Niilola @ 2024-03-12  9:54 UTC (permalink / raw
  To: gentoo-commits

commit:     bb0c48422f0219319e7c5b10c42f7d84df9053cd
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Tue Nov 28 20:06:49 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Mar 12 09:54:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb0c4842

media-gfx/hydrus: Drop 534

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/hydrus/Manifest          |   1 -
 media-gfx/hydrus/hydrus-534.ebuild | 150 -------------------------------------
 2 files changed, 151 deletions(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 415449bd1a83..e44d3683a5a0 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,2 +1 @@
-DIST hydrus-534.tar.gz 41548094 BLAKE2B bec115deae4202869f34ed205d4b6f10b63b17fcb3d950250c1cfb2752f021c57487172deb0cebf29a349822d02ee520f3761320f49214ff8adcde7716eda984 SHA512 52f21ae2121fefd83efa2c0df8087fc6872fcb5a89ef1bab71ab968e148b51326f521dcc0f7636a45a9a9ce7661921402d1fc792de1f0c9251efb49e86cb08f7
 DIST hydrus-538.tar.gz 41659526 BLAKE2B 4e6f4058fc8eefb154ec08667d9d586e48df688de2e887bae05cc381dc15c56ba2da4a97d1194bac2547af24a690e8d6962f05792babb68a9f0d5fb9ca23047e SHA512 da7bebf294356455597d8397391edcd3c7af032ef2d494ed2e91277c58bd29516068ba9ed99fa5df8d7bbfc47beb3488b3d73a0d99cb946d57546b095b6d6cd6

diff --git a/media-gfx/hydrus/hydrus-534.ebuild b/media-gfx/hydrus/hydrus-534.ebuild
deleted file mode 100644
index 851d373d97a8..000000000000
--- a/media-gfx/hydrus/hydrus-534.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="sqlite"
-
-DOCS_BUILDER=mkdocs
-DOCS_DEPEND="dev-python/mkdocs-material dev-python/regex"
-
-inherit python-single-r1 desktop docs optfeature
-
-DESCRIPTION="A booru-like media organizer for the desktop"
-HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
-else
-	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-	KEYWORDS="~amd64"
-fi
-
-# hydrus itself is WTFPL
-# icons included are CC-BY-2.5
-LICENSE="WTFPL-2 CC-BY-2.5"
-SLOT="0"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-# RDEPEND is sorted as such:
-# - No specific requirements
-# - Specific version or slot
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/cbor2[${PYTHON_USEDEP}]
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cloudscraper[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},lcms]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
-		dev-python/python-mpv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-		dev-python/service-identity[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/twisted[${PYTHON_USEDEP}]
-		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
-		media-video/ffmpeg
-
-		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	')
-"
-BDEPEND="
-	${RDEPEND}
-	$(python_gen_cond_dep '
-		test? (
-			dev-python/httmock[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-
-			dev-python/pyside2[widgets,gui,multimedia,${PYTHON_USEDEP}]
-		)
-	')
-"
-
-PATCHES=(
-	"${FILESDIR}/userpath-in-local-share.patch"
-)
-
-src_prepare() {
-	default
-
-	# Contains pre-built binaries for other systems and a broken swf renderer for linux
-	rm -r bin/ || die
-	# Python requirements file, not needed
-	rm requirements.txt || die
-	# Remove unneeded additional scripts
-	rm *.command *.sh *.bat || die
-}
-
-src_compile() {
-	python_optimize "${S}"
-	docs_compile
-}
-
-src_test() {
-	# The tests use unittest, but are run with a custom runner script.
-	# QT_QPA_PLATFORM is required to make them run without X
-	local -x QT_QPA_PLATFORM=offscreen
-	"${EPYTHON}" "${S}/hydrus_test.py" || die "Tests failed"
-}
-
-src_install() {
-	local doc="${EPREFIX}/usr/share/doc/${PF}"
-	elog "Hydrus includes an excellent manual, that can either be viewed at"
-	elog "${doc}/html/help/index.html"
-	elog "or accessed through the hydrus help menu."
-
-	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
-
-	local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/)
-	einstalldocs
-
-	# Files only needed for testing
-	rm hydrus_test.py hydrus/hydrus_test_boot.py || die
-	rm -r hydrus/test/ static/testing/ || die
-	# Build files used for CI and development, not actually needed. Has to be deleted after src_compile.
-	# because it contains documentation
-	rm -r static/build_files static/requirements || die
-
-	# ${DOCS[@]} files are copied into doc
-	# ${S}/docs/ is the markdown source code for documentation
-	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
-	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
-	if use doc; then
-		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
-		rm -r "${S}/_build" || die
-		# The program expects to find documentation here, so add a symlink to doc
-		dosym "${doc}/html" /opt/hydrus/help
-	fi
-
-	insinto /opt/hydrus
-	doins -r "${S}"/.
-
-	exeinto /usr/bin
-	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
-	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
-
-	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
-					   "AudioVideo;FileTools;Graphics;Network;"
-}
-
-pkg_postinst() {
-	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
-	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
-	optfeature "memory compression in the client" "dev-python/lz4"
-	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
-}


^ permalink raw reply related	[flat|nested] 104+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
@ 2024-06-02  0:41 Sam James
  0 siblings, 0 replies; 104+ messages in thread
From: Sam James @ 2024-06-02  0:41 UTC (permalink / raw
  To: gentoo-commits

commit:     a01d080e4f4337d55663933d7c3025ac258735a9
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Sat Apr 20 20:14:05 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun  2 00:39:52 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a01d080e

media-gfx/hydrus: Add 571, Fix 565

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://github.com/gentoo/gentoo/pull/36338
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/hydrus/Manifest                                    | 1 +
 media-gfx/hydrus/{hydrus-565.ebuild => hydrus-565-r1.ebuild} | 2 +-
 media-gfx/hydrus/{hydrus-565.ebuild => hydrus-571.ebuild}    | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 78d8b5ae805d..c6d9cec6333e 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,3 +1,4 @@
 DIST hydrus-3500-mpeg-error.patch 1632 BLAKE2B 9cc969a3a2d476ea606f3f280ecd6e4cc7f628420586e651377945d370a6c50464b118da1c96a577bc55b13bbac946801b9cff251922299f91e4a76dabf7edf9 SHA512 8769d63c7b2a345e1a7bfa0dae200bca03b991ef6a217150e3f50c95f3d1235305242348aa8fabf1183fc3d787498bbead8a96145e4cdd2251f67032469f095c
 DIST hydrus-565.tar.gz 46360280 BLAKE2B 7a9492db917b7f7d10fd92c668dff2206111b5734a707ea86e8d3f5c95359126da31e3bd6fdcea64c621527f5a30e608fdf8cd36b7b7b70185a37c3cc7483180 SHA512 442dde4c9e557c162b8a5cc23f22472d8c48d7717513a192875b413a59000897c05b2b050c16ad480cdbb18548485f51b5e8651e44cb2057fc8e6eb1b99e8f26
+DIST hydrus-571.tar.gz 46371027 BLAKE2B b0ca6a4d7fddb79808340c03d6ba6291021af752be95144b8475a12450394f21e76c5fd80a2f6094f21d6f4af25db22f5f8d2eb79fd3494be609d6bdcdb455cb SHA512 3d6b6dec777332128858fcd62f52026fd7a4ab831f7cc0b3a3af76d52b6c6d1ff7b9687554aa5569988386e1eb0b33111172029e25f0acb9f36bb1cd70fcccbc
 DIST hydrus-test-fixes.patch 820 BLAKE2B 9d912868142cd3e7763241652e81172236094de6d0cf4df888d7203d34ed37b469c4829401a6e3bda945e3683db9f8e577ef21040cb5d57b0e6c01c2c619655b SHA512 a6a322a77638122fdd1f74ca57c23360aa8d58d97877e9517db9d185c11a8187e807b9478533a97a4654d58342b0541cc7eb89b83075bc4c38ceda0effe06ce0

diff --git a/media-gfx/hydrus/hydrus-565.ebuild b/media-gfx/hydrus/hydrus-565-r1.ebuild
similarity index 98%
copy from media-gfx/hydrus/hydrus-565.ebuild
copy to media-gfx/hydrus/hydrus-565-r1.ebuild
index 1fd94b6ee116..07124a7dd9f9 100644
--- a/media-gfx/hydrus/hydrus-565.ebuild
+++ b/media-gfx/hydrus/hydrus-565-r1.ebuild
@@ -62,7 +62,7 @@ RDEPEND="
 		dev-python/twisted[${PYTHON_USEDEP}]
 
 		dev-python/QtPy[widgets,gui,svg,multimedia,${PYTHON_USEDEP}]
-		|| ( dev-python/QtPy[pyside2] dev-python/QtPy[pyside6] )
+		|| ( dev-python/QtPy[pyside2] dev-python/QtPy[pyqt6] )
 
 		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
 		media-video/ffmpeg

diff --git a/media-gfx/hydrus/hydrus-565.ebuild b/media-gfx/hydrus/hydrus-571.ebuild
similarity index 98%
rename from media-gfx/hydrus/hydrus-565.ebuild
rename to media-gfx/hydrus/hydrus-571.ebuild
index 1fd94b6ee116..07124a7dd9f9 100644
--- a/media-gfx/hydrus/hydrus-565.ebuild
+++ b/media-gfx/hydrus/hydrus-571.ebuild
@@ -62,7 +62,7 @@ RDEPEND="
 		dev-python/twisted[${PYTHON_USEDEP}]
 
 		dev-python/QtPy[widgets,gui,svg,multimedia,${PYTHON_USEDEP}]
-		|| ( dev-python/QtPy[pyside2] dev-python/QtPy[pyside6] )
+		|| ( dev-python/QtPy[pyside2] dev-python/QtPy[pyqt6] )
 
 		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
 		media-video/ffmpeg


^ permalink raw reply related	[flat|nested] 104+ messages in thread

end of thread, other threads:[~2024-06-02  0:41 UTC | newest]

Thread overview: 104+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-08-02  3:34 [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2024-06-02  0:41 Sam James
2024-03-12  9:54 Joonas Niilola
2024-03-12  9:54 Joonas Niilola
2024-03-12  9:54 Joonas Niilola
2024-03-12  9:54 Joonas Niilola
2023-09-18 16:39 Joonas Niilola
2023-09-18 16:39 Joonas Niilola
2023-09-18 16:39 Joonas Niilola
2023-07-26  3:02 Sam James
2023-07-26  3:02 Sam James
2023-06-18 12:08 Joonas Niilola
2023-06-18 12:08 Joonas Niilola
2023-06-18 12:08 Joonas Niilola
2023-05-20  6:28 Sam James
2023-05-20  6:28 Sam James
2023-05-20  6:28 Sam James
2023-04-10  8:37 Joonas Niilola
2023-04-10  8:37 Joonas Niilola
2023-03-11 17:15 Sam James
2023-03-11 17:15 Sam James
2023-02-26  4:01 Michał Górny
2023-02-26  4:01 Michał Górny
2023-02-13  4:48 Sam James
2023-02-13  4:48 Sam James
2023-02-05  9:13 Joonas Niilola
2023-02-05  9:13 Joonas Niilola
2023-01-07 16:49 Joonas Niilola
2023-01-07 16:49 Joonas Niilola
2023-01-07 16:49 Joonas Niilola
2023-01-07 16:49 Joonas Niilola
2023-01-07 16:49 Joonas Niilola
2023-01-07 16:49 Joonas Niilola
2023-01-07 16:49 Joonas Niilola
2023-01-07 16:49 Joonas Niilola
2022-12-03  8:53 Joonas Niilola
2022-12-03  8:53 Joonas Niilola
2022-12-03  8:53 Joonas Niilola
2022-11-07 19:30 Ionen Wolkens
2022-11-02 14:24 Joonas Niilola
2022-08-27 11:47 Sam James
2022-08-27 11:47 Sam James
2022-08-27 11:47 Sam James
2022-07-29  3:18 Sam James
2022-07-29  3:16 Sam James
2022-07-15  1:47 Sam James
2022-07-02 17:35 Joonas Niilola
2022-05-13 20:12 Sam James
2022-04-21 10:33 Joonas Niilola
2022-04-14 11:51 Joonas Niilola
2022-03-31 13:36 Joonas Niilola
2022-03-11 14:37 Joonas Niilola
2022-03-10 22:26 Sam James
2022-02-23  4:05 Sam James
2022-02-18  2:44 Sam James
2022-02-18  2:44 Sam James
2022-02-03  2:19 Sam James
2022-01-17  1:57 Sam James
2022-01-17  1:57 Sam James
2022-01-09  1:42 Sam James
2022-01-09  1:42 Sam James
2021-12-24  8:13 Sam James
2021-12-24  8:13 Sam James
2021-12-24  4:47 Sam James
2021-12-01 21:30 Sam James
2021-11-22 10:11 Sam James
2021-11-22 10:11 Sam James
2021-11-12  1:36 Sam James
2021-11-12  1:36 Sam James
2021-10-29 19:17 Sam James
2021-10-29 19:17 Sam James
2021-10-20  2:42 Sam James
2021-10-20  2:42 Sam James
2021-10-20  2:42 Sam James
2021-10-20  2:42 Sam James
2021-10-05  4:29 Sam James
2021-09-10  7:22 Joonas Niilola
2021-09-10  7:22 Joonas Niilola
2021-09-10  7:22 Joonas Niilola
2021-09-04 11:50 Joonas Niilola
2021-09-04 11:50 Joonas Niilola
2021-08-28 16:50 Sam James
2021-08-28 16:50 Sam James
2021-08-24  8:50 Joonas Niilola
2021-08-24  8:50 Joonas Niilola
2021-08-15 17:17 Joonas Niilola
2021-08-15 17:17 Joonas Niilola
2021-08-09 16:40 Joonas Niilola
2021-08-09 16:40 Joonas Niilola
2021-08-09 16:40 Joonas Niilola
2021-08-02  3:34 Sam James
2021-07-16  1:34 Sam James
2021-07-16  1:34 Sam James
2021-07-13  4:22 Sam James
2021-07-13  4:22 Sam James
2021-07-05 13:29 Michał Górny
2021-07-01  8:54 Sam James
2021-07-01  8:54 Sam James
2021-07-01  8:54 Sam James
2021-07-01  8:54 Sam James
2021-06-29  4:40 Sam James
2021-06-11 21:29 Sam James
2021-06-11 21:29 Sam James
2021-06-02 19:47 Michał Górny

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox