gentoo auto-resync : 09:07:2022 - 19:15:57

5 files changed, 66 insertions, 122 deletions

diff --git a/media-gfx/mcomix/Manifest b/media-gfx/mcomix/Manifest
index fc7d94169a67..f59f5a0b4261 100644
--- a/media-gfx/mcomix/Manifest
+++ b/media-gfx/mcomix/Manifest
@@ -1,6 +1,6 @@
-DIST mcomix-1.3.0_pre20201123.tar.gz 3888279 BLAKE2B 0bce5d8b3d6e20fc3c422d137963fa8cf506ce969bb5c8062b1db4dcd85d5c1912352fa1eb8c752719b0ac95715486ae47d56e0bf24119f9f55af56f6fbf657c SHA512 24b470e1dca266851bb241f109b39c785443ece36d12a01e579c8a59cb7585ad3978b3696829318f04d4b172cfcf57cf100d76c7c25765260bf26f698d85ba2a
 DIST mcomix-1.3.0_pre20211015.tar.gz 3888967 BLAKE2B 16275b5e63dbedb481dba34e787681a9bbc0615c53c71a0037f7d15fa5ee135b5c2508bbf4ef7fddeb45b65c291d5651d81b2e0a180de26054cdbe994ceab028 SHA512 93092a8ec992922bd2327c33a5ab86edbffcdc66e9da5b443d7e4131686b2c3b47017aa4f02b0ca991b6d08dd68e6578137bbf6028ca274efcd2679a12cfe05d
-EBUILD mcomix-1.3.0_pre20201123.ebuild 1744 BLAKE2B be86355dc4c55efe4d87bc22291391a4dcc851eae28bd7cba024c93c4a42341234b4e8891e937cc0b323701ad23c96ec0855ceb2c07cc71d2951724b0420c2c7 SHA512 112c81eefdbc94a8c6864ed0f09a91b1e753222693cb4caad3ac93d34a5c024a748884d3b45b3bfeff8fdbd5b2ca9ec177fa0f2cbd78e2816788c9b1b94c70dc
+DIST mcomix-2.0.2.tar.gz 515427 BLAKE2B 3f7b7a0788622173049169034a0a8ed3d3d5fb64fd32e10f4cb3f5b1a4815dee29a1a1b576798bddaeb41534ab66cb301825ddcd39b0b01252e1bbe37e0384b9 SHA512 fb908f19b98364e8a765c26fe6b2d7e0b147210b4406a421ae7f010ffdf1987520899ffe2343a26bcdb0bf6b6c9cc5f5ec866f72adb49fb16f0911dd42289a0d
 EBUILD mcomix-1.3.0_pre20211015.ebuild 1744 BLAKE2B de625b1d28b4ef329868f03fa1fad400ac81a1be9bf1a8a8ea8ca994a50446ad2804d98d0c7212855e3c7bd4f8f7d1e440ae9c9bae17e263b5028bd0d84a99aa SHA512 b457e2f35f4cb62f808a543afe970ae7c3037ec5ce023a9572916c4fe218900bcb41dd01b27aa871e49c630c52d70ddb24705fba5a1374a2dac21c32758e552d
-EBUILD mcomix-9999.ebuild 1582 BLAKE2B 93209ca60913f37a2d2484178795fb7ebe544b68a38850ad1c5d29b0cd5871cb24aafd2f4fedaaf695388afd650647b3a53bb2157539a86b05bca9aa916b30e6 SHA512 2325bf94421e427eabd661de45617055ace4ba893a03401258c3a92b98594e6e6ed65b18801daaa0324ae0edd833ac8ea791b68daaea0e6c79825834f5d160e2
-MISC metadata.xml 398 BLAKE2B 1595be3107e03d5ea0602c77d75d0d5b10c6c36307edaa979b64ce3418c674cd3905578ea098159493860ea4b3fb3c297da24b281869dedf92b7eec8f70d32c8 SHA512 4783cdb12689f0e346769eebd4da9a14e40225c30f6afed9b7058a6ac6eb3591b39990c70f2b57339582f27a71c2fa9f88390401f51cb5f7d43cc8c0d9a39205
+EBUILD mcomix-2.0.2.ebuild 1078 BLAKE2B 02fb804e596c3dbcc80fee96e2cb8d1e8087f0780a81264183a58c13e52ab109a97bd6222522d5facd56431c868d66d048bcd6dd82ac6034c8846dc7dcf88ba9 SHA512 bf39e1eb63cb0245bc0e8fa002fb4cb736b5389629aa77024c08189e9b894569d6f7b30dfca773b3cd5d3307ece3a11891e6a9dc7c578ac344f2905d8b4fdabe
+EBUILD mcomix-9999.ebuild 1063 BLAKE2B 4c372c8b3c6a7886771c486e82cbdde53bedd22d1a1522ba9281615895cba49766eca6198bfc3d12b673fc28ca98fdd6a83803e69bf74ab6a14eefcb6d38142e SHA512 23b6fa6c466e0866b63c8b75c0c32a2c2fd007ea7e530ccd08b4dead2ea72a715d7a2c1ce7dff67a7391237bfed9c7ecb4653e36733ba52eac71d99baf4554a7
+MISC metadata.xml 339 BLAKE2B 16c122a9f4454ff61d2b777e14de1bf321ba4d98aadd3284f88a13419bac2cdb227bd1001ef6960aaaa183b3e2f86f2d7b5a555aa9a17a6ad1f9e46db2657609 SHA512 a66ff965443f30fe9c647a760359ee71b4ed9cbe5ff684979fb547823bf1ae5ffbf8cd4128afdfef13d07c03e953ed5495b9e80526ec01a0e53b66b1b0f2e6dc
diff --git a/media-gfx/mcomix/mcomix-1.3.0_pre20201123.ebuild b/media-gfx/mcomix/mcomix-1.3.0_pre20201123.ebuild
deleted file mode 100644
index b110995c4fc0..000000000000
--- a/media-gfx/mcomix/mcomix-1.3.0_pre20201123.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit desktop python-r1 xdg
-
-# Hash used for this version
-GIT_PV="cdcb27533dc7ee2ebf7b0a8ab5ba10e61c0b8ff8"
-
-DESCRIPTION="GTK image viewer for comic book archives"
-HOMEPAGE="https://github.com/multiSnow/mcomix3"
-SRC_URI="https://github.com/multiSnow/mcomix3/archive/${GIT_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pygobject[${PYTHON_USEDEP}]
-	media-libs/libjpeg-turbo:0"
-BDEPEND="sys-devel/gettext"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-S=${WORKDIR}/mcomix3-${GIT_PV}
-
-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
-}
-
-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
-}
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 @@
   </maintainer>
   <upstream>
     <remote-id type="sourceforge">mcomix</remote-id>
-    <remote-id type="github">multiSnow/mcomix3</remote-id>
   </upstream>
 </pkgmetadata>