From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AC546139345 for ; Thu, 1 Jul 2021 08:54:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 61B55E0867; Thu, 1 Jul 2021 08:54:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 38A13E0867 for ; Thu, 1 Jul 2021 08:54:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 11BB9340806 for ; Thu, 1 Jul 2021 08:54:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 89DA57B3 for ; Thu, 1 Jul 2021 08:54:44 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1625129625.3598eded30d4efe87217ac8ce491d2d58e55524b.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/hydrus/Manifest media-gfx/hydrus/hydrus-441-r1.ebuild X-VCS-Directories: media-gfx/hydrus/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 3598eded30d4efe87217ac8ce491d2d58e55524b X-VCS-Branch: master Date: Thu, 1 Jul 2021 08:54:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c28d537f-fb46-4a2f-b74b-9369bed9e129 X-Archives-Hash: 93e182e08540aabaf0ed58b4bf24d28c commit: 3598eded30d4efe87217ac8ce491d2d58e55524b Author: Ekaterina Vaartis kotobank ch> AuthorDate: Thu Jul 1 08:03:32 2021 +0000 Commit: Sam James gentoo 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 kotobank.ch> Signed-off-by: Sam James 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" -}