gentoo resync : 14.12.2020

3 files changed, 79 insertions, 5 deletions

diff --git a/media-gfx/mcomix/Manifest b/media-gfx/mcomix/Manifest
index ed2f9afcb24d..a97915d6a91c 100644
--- a/media-gfx/mcomix/Manifest
+++ b/media-gfx/mcomix/Manifest
@@ -1,4 +1,6 @@
 DIST mcomix-1.3.0_pre20200206.tar.gz 3292571 BLAKE2B ad76316020645495042d27bf831588e628da11077efe29b302a57be4e688558b4db8d3f850200bf4a54b84b428a16a52f88ea5e20be85b628ef3630a5f624643 SHA512 c98d4a7022993af3a5c0b5425df52f14b586549472bcd4576a72039c8c6d4fde31df4255df45ab7467acb0280bda02b92d4803b7f92b7c1c818b58df7b52a3ff
+DIST mcomix-1.3.0_pre20201123.tar.gz 3888279 BLAKE2B 0bce5d8b3d6e20fc3c422d137963fa8cf506ce969bb5c8062b1db4dcd85d5c1912352fa1eb8c752719b0ac95715486ae47d56e0bf24119f9f55af56f6fbf657c SHA512 24b470e1dca266851bb241f109b39c785443ece36d12a01e579c8a59cb7585ad3978b3696829318f04d4b172cfcf57cf100d76c7c25765260bf26f698d85ba2a
 EBUILD mcomix-1.3.0_pre20200206.ebuild 1801 BLAKE2B 9503275bf00c885a3549dfdcd168013b6c11bca743ae339e0865db26b2d2985cd8c50d3f6b47c69e63d787cf41faaebb260e4a8e828c0116609a163aadce8743 SHA512 90d21b3e9b83c3b97a713f94155c9b914a5716d4b9443139ee0824fca03538549be6706e2a02a14762e04875189d0b9fe9d9666dec3408bf95b90ba09291616f
-EBUILD mcomix-9999.ebuild 1646 BLAKE2B 1d3b03cf2a5584f446b8b59501c044be9a7c4a10fd0aa20e8fa2f8fcd71f24c0e4a7b3d24e90e9ad152eccb639daaeba8aecb6e92724e5e6429f5e8fd367434c SHA512 3c5f49c2808abbe48dac1ff1ab6f2d92bf48e8882c972c325c2ab78a6ab4a2120f8c32a32e78bfae73da31fb78aec38e1d854737b8b9032592567fb71ae5e4d6
+EBUILD mcomix-1.3.0_pre20201123.ebuild 1745 BLAKE2B 841eaedeb156d6983f8f7f6e3baefb5d4b6208ccbc4633f34b4a1de2908cbb6221d7f46ceb19e500ed1f38e182e7e236d4a85b608679f3977c0a5f3be9320518 SHA512 c008603dcd034776966f4464a317fd5319a64141ca4a0576a61a5ef03e9547a2bce4c1678f447ac7c87d451471e95c7f9f7920407672524ff2ee6cc7031d4537
+EBUILD mcomix-9999.ebuild 1588 BLAKE2B 7d1a9c6baae95d6cdafab53697649decb1d7da988cf433687d3289511f98633f72dcd088be05cb3f262b9de37521333b63de77455042d8181683adac9eaaf1d5 SHA512 03bf0d5ae2392116ed456bf2618c8f58a634fb26dbcd1a3682fd787c8d2664e797b96c0f3d885bd93e12bfa5e988f4b35d32151518e905c8d70a3d1ed8636b87
 MISC metadata.xml 397 BLAKE2B 35568ccc8d25ece0069a6f8c404ec0a15f6709dbdb13f235c262f70ddab42ef3c3c431ac989c5ccf2c64c924dd22b1d830c8971576ca11f2358050eec98f138a SHA512 72c698bdfa865d64cb9062e7247fcb0b11195a72d19ad83f7295319a665c4b2a36f4f33cf43a84cb03c3308101a0aa4bf0185756c6cc0bb8a14637cefeb33d97
diff --git a/media-gfx/mcomix/mcomix-1.3.0_pre20201123.ebuild b/media-gfx/mcomix/mcomix-1.3.0_pre20201123.ebuild
new file mode 100644
index 000000000000..5f6da1834a5f
--- /dev/null
+++ b/media-gfx/mcomix/mcomix-1.3.0_pre20201123.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,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 ~x86"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	virtual/jpeg
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pygobject[${PYTHON_USEDEP}]
+	!media-gfx/comix"
+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-9999.ebuild b/media-gfx/mcomix/mcomix-9999.ebuild
index 15afb7c558eb..da1210c5e2bf 100644
--- a/media-gfx/mcomix/mcomix-9999.ebuild
+++ b/media-gfx/mcomix/mcomix-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit desktop git-r3 python-r1 xdg
 
 DESCRIPTION="GTK image viewer for comic book archives"
@@ -52,9 +52,6 @@ src_install() {
 	insinto /usr/share/metainfo
 	doins mime/mcomix.appdata.xml
 
-	insinto /usr/share/mime/packages
-	doins mime/mcomix.xml
-
 	dodoc README.rst TODO
 }