| 1 |
commit: 8cfeb9d38290bd94e74dab35cb8617d28b115eee |
| 2 |
Author: Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch> |
| 3 |
AuthorDate: Sat Mar 26 13:32:52 2022 +0000 |
| 4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Mar 31 13:36:26 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cfeb9d3 |
| 7 |
|
| 8 |
media-gfx/hydrus: Drop 472, add 478 |
| 9 |
|
| 10 |
The program now depends on cbor2 |
| 11 |
|
| 12 |
Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch> |
| 13 |
Closes: https://github.com/gentoo/gentoo/pull/24759 |
| 14 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
| 15 |
|
| 16 |
media-gfx/hydrus/Manifest | 2 +- |
| 17 |
.../{hydrus-472.ebuild => hydrus-478.ebuild} | 28 ++++++++++++++-------- |
| 18 |
2 files changed, 19 insertions(+), 11 deletions(-) |
| 19 |
|
| 20 |
diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest |
| 21 |
index 6feab9e3d28c..112b857a11bf 100644 |
| 22 |
--- a/media-gfx/hydrus/Manifest |
| 23 |
+++ b/media-gfx/hydrus/Manifest |
| 24 |
@@ -1,4 +1,4 @@ |
| 25 |
-DIST hydrus-472.tar.gz 39421962 BLAKE2B 2e7ac5d5169aed1d9437434514d878ce175bfe13116f8972b2a21532e0058ce09d9a55744e17b71d1755ebc8436d6f2ff4995dd81c9a49844aff42e60cd2564f SHA512 5b3eecf724fd2e6dede39bbf33665607294d7f345baf052fe379a241d6ee157550ca390d32bb1b256c1fee2224190b54ba9d7d0718ec10b147580eb1f5216b34 |
| 26 |
DIST hydrus-473.tar.gz 40044270 BLAKE2B 1aecc84aa60318fadffcf3ad3d8358fa4f537ca1ca55ae7ce02aade0e44b266f42ae94c423854874c471e1d8dc0988e232d19f2e5dd4e2d12834055b75814e9a SHA512 372e813deaef82fe02686e4d7fe5f9ab15476a954b53da8b3560a4cf45ad44209b22b727c32510714ff937b0e6116dae403b3a69954e51c5e62b67bea4eda808 |
| 27 |
DIST hydrus-474.tar.gz 40052948 BLAKE2B 7d323caf6dee2dc8a1dcf792a5c3383b395374d0e5a8fd88489b08a5b4ad295317cd5ae1da95d5435fb44ea8d4bbe4038d821c037c156e11d8b8c8a8582d67be SHA512 b73f5823ff84cf84710dd1fd9f9bfedffb6ce9ffaba8e4b23a7eda4a6a206aeaa8993632858fab9a5934f4c279fc23955cf045cd38af7ccf78b1eb73a0940bdb |
| 28 |
DIST hydrus-476.tar.gz 40139397 BLAKE2B 68a3f31a8f250b2c129a9f2562624ec98994e338112eba4f0953aa96dd95abdb97fc60f6a8f28efb5a660f543f596a344a13fe234b3ffb11e6a158b795b0a11c SHA512 5aa59cc2e4d72219d24de10eaeb99ad5b13c0de3af8d9c7e55e3ccea3b897077596401d4d034aac05c018a969f84507618f95ef70d422ac57075bf2d64a692c5 |
| 29 |
+DIST hydrus-478.tar.gz 40150962 BLAKE2B d654d2c12de8c8af6212679ed719892bcb6172d0b2120718e1bca7159ea3ab0f509dd01bf7c6f57f7da4d5e711c7b85cd0ce467ebc5fe0b08214085e3ca13cc5 SHA512 eb92071e0c9a0c3d04ef72336feaa55e47d28c523916484090220f30fa137c7d6b09b1d97e214fd191212a54e5d653eba08cfa1fe3f242a488d22cc331279e9b |
| 30 |
|
| 31 |
diff --git a/media-gfx/hydrus/hydrus-472.ebuild b/media-gfx/hydrus/hydrus-478.ebuild |
| 32 |
similarity index 81% |
| 33 |
rename from media-gfx/hydrus/hydrus-472.ebuild |
| 34 |
rename to media-gfx/hydrus/hydrus-478.ebuild |
| 35 |
index aa080605c68f..eeb2fa504f8a 100644 |
| 36 |
--- a/media-gfx/hydrus/hydrus-472.ebuild |
| 37 |
+++ b/media-gfx/hydrus/hydrus-478.ebuild |
| 38 |
@@ -1,4 +1,4 @@ |
| 39 |
-# Copyright 1999-2021 Gentoo Authors |
| 40 |
+# Copyright 1999-2022 Gentoo Authors |
| 41 |
# Distributed under the terms of the GNU General Public License v2 |
| 42 |
|
| 43 |
EAPI=7 |
| 44 |
@@ -6,7 +6,10 @@ EAPI=7 |
| 45 |
PYTHON_COMPAT=( python3_{8..9} ) |
| 46 |
PYTHON_REQ_USE="sqlite" |
| 47 |
|
| 48 |
-inherit python-single-r1 desktop optfeature |
| 49 |
+DOCS_BUILDER=mkdocs |
| 50 |
+DOCS_DEPEND="dev-python/mkdocs-material" |
| 51 |
+ |
| 52 |
+inherit python-single-r1 desktop docs optfeature |
| 53 |
|
| 54 |
DESCRIPTION="A booru-like media organizer for the desktop" |
| 55 |
HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus" |
| 56 |
@@ -36,6 +39,7 @@ RESTRICT="!test? ( test )" |
| 57 |
RDEPEND=" |
| 58 |
${PYTHON_DEPS} |
| 59 |
$(python_gen_cond_dep ' |
| 60 |
+ dev-python/cbor2[${PYTHON_USEDEP}] |
| 61 |
dev-python/chardet[${PYTHON_USEDEP}] |
| 62 |
dev-python/cloudscraper[${PYTHON_USEDEP}] |
| 63 |
dev-python/html5lib[${PYTHON_USEDEP}] |
| 64 |
@@ -82,14 +86,13 @@ src_prepare() { |
| 65 |
rm -r bin/ || die |
| 66 |
# Build files used for CI, not actually needed |
| 67 |
rm -r static/build_files || die |
| 68 |
- # Duplicate license file, not needed |
| 69 |
- rm license.txt || die |
| 70 |
# Python requirements files, not needed |
| 71 |
rm requirements_*.txt || die |
| 72 |
} |
| 73 |
|
| 74 |
src_compile() { |
| 75 |
python_optimize "${S}" |
| 76 |
+ docs_compile |
| 77 |
} |
| 78 |
|
| 79 |
src_test() { |
| 80 |
@@ -107,18 +110,23 @@ src_install() { |
| 81 |
|
| 82 |
mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die |
| 83 |
|
| 84 |
- local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/) |
| 85 |
- local HTML_DOCS=("${S}"/help/) |
| 86 |
+ local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/) |
| 87 |
einstalldocs |
| 88 |
|
| 89 |
# Files only needed for testing |
| 90 |
rm test.py hydrus/hydrus_test.py || die |
| 91 |
rm -r hydrus/test/ static/testing/ || die |
| 92 |
|
| 93 |
- # These files are copied into doc |
| 94 |
- rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die |
| 95 |
- # The program expects to find documentation here, so add a symlink to doc |
| 96 |
- dosym "${doc}/html/help" /opt/hydrus/help |
| 97 |
+ # ${DOCS[@]} files are copied into doc |
| 98 |
+ # ${S}/docs/ is the markdown source code for documentation |
| 99 |
+ # .gitignore/.github files aren't needed for the program to work, same with mkdocs files |
| 100 |
+ rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die |
| 101 |
+ if use doc; then |
| 102 |
+ # ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation |
| 103 |
+ rm -r "${S}/_build" || die |
| 104 |
+ # The program expects to find documentation here, so add a symlink to doc |
| 105 |
+ dosym "${doc}/html" /opt/hydrus/help |
| 106 |
+ fi |
| 107 |
|
| 108 |
insinto /opt/hydrus |
| 109 |
doins -r "${S}"/. |
Archives