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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DDE99158095 for ; Sat, 9 Jul 2022 15:43:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1DE63E07D1; Sat, 9 Jul 2022 15:43:44 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CC0EEE07D1 for ; Sat, 9 Jul 2022 15:43:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A2E93340F3B for ; Sat, 9 Jul 2022 15:43:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C3FD0535 for ; Sat, 9 Jul 2022 15:43:39 +0000 (UTC) From: "Bernard Cafarelli" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Bernard Cafarelli" Message-ID: <1657381254.16e61335682f168c215504e4fe4e7090397fc4f1.voyageur@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/mcomix/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/mcomix/Manifest media-gfx/mcomix/mcomix-2.0.2.ebuild media-gfx/mcomix/mcomix-9999.ebuild media-gfx/mcomix/metadata.xml X-VCS-Directories: media-gfx/mcomix/ X-VCS-Committer: voyageur X-VCS-Committer-Name: Bernard Cafarelli X-VCS-Revision: 16e61335682f168c215504e4fe4e7090397fc4f1 X-VCS-Branch: master Date: Sat, 9 Jul 2022 15:43:39 +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: 33d4de9c-ab74-430c-ab31-7905cfb56d30 X-Archives-Hash: 8c866e0ccfbddb752d09a3ef9af994a5 commit: 16e61335682f168c215504e4fe4e7090397fc4f1 Author: Bernard Cafarelli gentoo org> AuthorDate: Sat Jul 9 15:40:07 2022 +0000 Commit: Bernard Cafarelli gentoo org> CommitDate: Sat Jul 9 15:40:54 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16e61335 media-gfx/mcomix: 2.0.2 bump Switch back to original project, now python3 and gtk3 compatible with new releases Signed-off-by: Bernard Cafarelli gentoo.org> media-gfx/mcomix/Manifest | 1 + media-gfx/mcomix/mcomix-2.0.2.ebuild | 44 ++++++++++++++++++++++++++ media-gfx/mcomix/mcomix-9999.ebuild | 61 +++++++++++------------------------- media-gfx/mcomix/metadata.xml | 1 - 4 files changed, 63 insertions(+), 44 deletions(-) diff --git a/media-gfx/mcomix/Manifest b/media-gfx/mcomix/Manifest index e331ad6213f0..c39b8398fb36 100644 --- a/media-gfx/mcomix/Manifest +++ b/media-gfx/mcomix/Manifest @@ -1 +1,2 @@ DIST mcomix-1.3.0_pre20211015.tar.gz 3888967 BLAKE2B 16275b5e63dbedb481dba34e787681a9bbc0615c53c71a0037f7d15fa5ee135b5c2508bbf4ef7fddeb45b65c291d5651d81b2e0a180de26054cdbe994ceab028 SHA512 93092a8ec992922bd2327c33a5ab86edbffcdc66e9da5b443d7e4131686b2c3b47017aa4f02b0ca991b6d08dd68e6578137bbf6028ca274efcd2679a12cfe05d +DIST mcomix-2.0.2.tar.gz 515427 BLAKE2B 3f7b7a0788622173049169034a0a8ed3d3d5fb64fd32e10f4cb3f5b1a4815dee29a1a1b576798bddaeb41534ab66cb301825ddcd39b0b01252e1bbe37e0384b9 SHA512 fb908f19b98364e8a765c26fe6b2d7e0b147210b4406a421ae7f010ffdf1987520899ffe2343a26bcdb0bf6b6c9cc5f5ec866f72adb49fb16f0911dd42289a0d diff --git a/media-gfx/mcomix/mcomix-2.0.2.ebuild b/media-gfx/mcomix/mcomix-2.0.2.ebuild new file mode 100644 index 000000000000..575e32e3e1ee --- /dev/null +++ b/media-gfx/mcomix/mcomix-2.0.2.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8..11} ) +inherit distutils-r1 optfeature xdg + +DESCRIPTION="GTK image viewer for comic book archives" +HOMEPAGE="http://mcomix.sourceforge.net" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +IUSE="" + +DEPEND="${PYTHON_DEPS}" +RDEPEND="${DEPEND} + >=dev-python/pillow-6.0.0[${PYTHON_USEDEP}] + >=dev-python/pycairo-1.16.0[${PYTHON_USEDEP}] + >=dev-python/pygobject-3.36.0[${PYTHON_USEDEP}] + media-libs/libjpeg-turbo:0" +BDEPEND="sys-devel/gettext" +# Most tests are quite old and do not run +RESTRICT="test" + +src_prepare() { + default + + # Uncompress man page + gunzip mcomix.1.gz || die + sed -e "s/mcomix.1.gz/mcomix.1/" -i setup.py || die +} + +pkg_postinst() { + xdg_pkg_postinst + + optfeature "RAR (.cbr) archives" app-arch/unrar + optfeature "7Zip archives" app-arch/p7zip + optfeature "LHA/LZA archives" app-arch/lha + optfeature "PDF files" app-text/mupdf +} diff --git a/media-gfx/mcomix/mcomix-9999.ebuild b/media-gfx/mcomix/mcomix-9999.ebuild index 137628e7dda6..f0dfb0115b36 100644 --- a/media-gfx/mcomix/mcomix-9999.ebuild +++ b/media-gfx/mcomix/mcomix-9999.ebuild @@ -3,12 +3,13 @@ EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) -inherit desktop git-r3 python-r1 xdg +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8..11} ) +inherit distutils-r1 git-r3 optfeature xdg DESCRIPTION="GTK image viewer for comic book archives" -HOMEPAGE="https://github.com/multiSnow/mcomix3" -EGIT_REPO_URI="https://github.com/multiSnow/mcomix3" +HOMEPAGE="http://mcomix.sourceforge.net" +EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/git" LICENSE="GPL-2" SLOT="0" @@ -17,53 +18,27 @@ IUSE="" DEPEND="${PYTHON_DEPS}" RDEPEND="${DEPEND} - dev-python/pillow[${PYTHON_USEDEP}] - dev-python/pygobject[${PYTHON_USEDEP}] + >=dev-python/pillow-6.0.0[${PYTHON_USEDEP}] + >=dev-python/pycairo-1.16.0[${PYTHON_USEDEP}] + >=dev-python/pygobject-3.36.0[${PYTHON_USEDEP}] media-libs/libjpeg-turbo:0" BDEPEND="sys-devel/gettext" - -REQUIRED_USE=${PYTHON_REQUIRED_USE} +# Most tests are quite old and do not run +RESTRICT="test" src_prepare() { default - for file in mcomix/mcomix/messages/*/LC_MESSAGES/*po - do - msgfmt ${file} -o ${file/po/mo} || die - rm ${file} || die - done -} - -src_install() { - python_foreach_impl python_domodule mcomix/mcomix - python_foreach_impl python_newscript mcomix/mcomixstarter.py mcomix - - for size in 16 22 24 32 48 - do - doicon -s ${size} \ - mime/icons/${size}x${size}/*png \ - mcomix/mcomix/images/${size}x${size}/mcomix.png - done - doicon mcomix/mcomix/images/mcomix.png - domenu mime/mcomix.desktop - doman man/mcomix.1 - - insinto /usr/share/metainfo - doins mime/mcomix.appdata.xml - - dodoc README.rst TODO + # Uncompress man page + gunzip mcomix.1.gz || die + sed -e "s/mcomix.1.gz/mcomix.1/" -i setup.py || die } pkg_postinst() { xdg_pkg_postinst - echo - elog "Additional packages are required to open the most common comic archives:" - elog - elog " cbr: app-arch/unrar" - elog " cbz: app-arch/unzip" - elog - elog "You can also add support for 7z or LHA archives by installing" - elog "app-arch/p7zip or app-arch/lha. Install app-text/mupdf for" - elog "pdf support." - echo + + optfeature "RAR (.cbr) archives" app-arch/unrar + optfeature "7Zip archives" app-arch/p7zip + optfeature "LHA/LZA archives" app-arch/lha + optfeature "PDF files" app-text/mupdf } diff --git a/media-gfx/mcomix/metadata.xml b/media-gfx/mcomix/metadata.xml index d517b361220b..f62d0f2ed5e2 100644 --- a/media-gfx/mcomix/metadata.xml +++ b/media-gfx/mcomix/metadata.xml @@ -7,6 +7,5 @@ mcomix - multiSnow/mcomix3