gentoo auto-resync : 21:09:2023 - 23:15:31

3 files changed, 81 insertions, 4 deletions

diff --git a/media-gfx/mcomix/Manifest b/media-gfx/mcomix/Manifest
index e04cd139de6b..e49215f15008 100644
--- a/media-gfx/mcomix/Manifest
+++ b/media-gfx/mcomix/Manifest
@@ -2,8 +2,10 @@ AUX mcomix-2.1.1-pillow_version.patch 697 BLAKE2B 4ddc0c824bedb8e53032a39d7fc770
 DIST mcomix-2.1.0.tar.gz 517070 BLAKE2B 71aa67b48ac4cc09f12516312a07c1688e3d9ba086e0af8fab0f22549814fc82841b30965b7ac4e90192086338414c50d253af2d37b158fea8fc2358cee3d3db SHA512 385654c48192c20e285a053a8a90f1e792d58f7adbb0960745f31703d2ff5906f5e5bfd868ebaa08dd27314543a761a255503e5d586edd1baa064ffcea0205ca
 DIST mcomix-2.1.1.tar.gz 517628 BLAKE2B fb4d6cb4a10966795156672e8710e264f6e22abeebc3bd9471f378169417a6aab39c705d916624b9c1cd547516ae042d94cf00cf4596242f4655045c305bc630 SHA512 699fc1fe2348491ca5f94c9142e8a7432a3afc932aff42187ec57b5026d84ad189700283082fb60f920088747f13cc8f74297feaaab8ce2a5a9bd42d74b7f5e2
 DIST mcomix-2.2.1.tar.gz 531734 BLAKE2B 4dfff8f12b3e719dcb9c32535b8d53fe5443a743fb2a7287e2b00ebb7325124c04fca5fbc853462f7e55a5ca361ba6bebd9abe5f07bad67abd5278facd9e6303 SHA512 9f9e2f0f2b0b7d1c7f5d027e852bf081c63789676ed4dabd7bce3f442b51954f3950926086ba8d279a4c88fd8f8918690bdca07d4681671ac11e97e79a73829b
+DIST mcomix-3.0.0.tar.gz 666676 BLAKE2B 48c4566cc09c99e4cea76e487753c43fc36ed9e06c26dd1cbcf0e16b1ded4cf438cbcd2d423bdff393468a368d226a499b70967b9fc094d526bb4637c5d3b24b SHA512 e6661c72e132cef04a16b795b17262da706fd27c169d791a576be4fe812c2fc5e5c1f83fb6c4ed094eb9a305ba836524d0717fc6dfa77d8543493bda71d9d815
 EBUILD mcomix-2.1.0.ebuild 1109 BLAKE2B 0041670c4f8cdb3eac50f5526305aca2c0448a3aec7123626a2eb3ebebbd792da721642505a392a059a7db7cef40bb048b6b1086a713c9bab18644bad9a04549 SHA512 0793f5c761a31b43e36b22cae11567ebd6d35cb38de608b051dc88f5a808ca31812ab47c324bfcc901e9b64c2435e34609f401b76e86f19fd2b9f319dc407575
 EBUILD mcomix-2.1.1-r1.ebuild 1164 BLAKE2B 43dc15b6e54faa3a2f2157c86150785af1b3b59308c422f5184f381d40e8c9eb69f2266c6769dc9801d1481e196e110726cbad29c88a0c7c482e83dad92df212 SHA512 4ae9d007439e20a9cdb74a081495c8cbb4b4620f19a4a28063ebffd1e74d4a3d9ef37b31fc24a8e94e87f5075cde79f5a9c485063e15c778f39c569b15ff998c
 EBUILD mcomix-2.2.1.ebuild 1111 BLAKE2B 56f9ccb5606133dd38bd572586226fd2b4ddf13cc589dc5becc7a52c1a2e65f7a17abd9b7770481b04b177b5bfce26a0e20d0b3bcd7993ddc2af4646ed9dcbf0 SHA512 ee58a7aeb7273e7191e6a95818bfe6a030865c47e0b2183495e1cd5acb1bef09b24a290cee4a2b03e4a8b83be030bb085a7874fd57f710395fff97ba505e3e71
-EBUILD mcomix-9999.ebuild 1096 BLAKE2B f42c1830533a776f2c89b58cc4e563a6c4552ee5796112d22dfbd0644f6b34803867ad31669fc08c225adafd183c90dc822b1b3bd54fb68ee809a54fd84d93cc SHA512 36b339b90fb739e6973eee2c2c0a096e6858ac960923cd37db6b2bdacd36fdce4dc93e2c06ac998c8cd3ad6d75ce8747ceabeeec3e5674e384e7c35dedb372c5
+EBUILD mcomix-3.0.0.ebuild 1470 BLAKE2B 5c5e219473275bf539d3a954aa6009282ecb54cf5d2d8795b209a541bad9f9f28deaeb197fbcb4d68871df42fca239357a430486ca9ca49ecfb2f5064b271cb8 SHA512 c827ce39559f7719ad7db6e3c8539928be0377d86fb52f5ec150b95e06688ea3a1fee9e9599e332ade9b00b1ef78dcc5702d7deef38e67276adfe6dbeccab6fa
+EBUILD mcomix-9999.ebuild 1455 BLAKE2B df793128e16145d065b81e641edfa9e91be1b3c8dc56df127785e66697f79245b83c033efdb5316bbf0997a52e10b2456efead5f5db890b97e03204f9f42e62c SHA512 6a772da1bbcee2fdf00a588bbf0662a1e9ea21f7d09275421b218c88cc63bf43edf0e1d10dd25e7f663e6db87226d2aaba7a589909d313ec4e05852f657e4636
 MISC metadata.xml 398 BLAKE2B 1595be3107e03d5ea0602c77d75d0d5b10c6c36307edaa979b64ce3418c674cd3905578ea098159493860ea4b3fb3c297da24b281869dedf92b7eec8f70d32c8 SHA512 4783cdb12689f0e346769eebd4da9a14e40225c30f6afed9b7058a6ac6eb3591b39990c70f2b57339582f27a71c2fa9f88390401f51cb5f7d43cc8c0d9a39205
diff --git a/media-gfx/mcomix/mcomix-3.0.0.ebuild b/media-gfx/mcomix/mcomix-3.0.0.ebuild
new file mode 100644
index 000000000000..1afebf0d5c64
--- /dev/null
+++ b/media-gfx/mcomix/mcomix-3.0.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..12} )
+inherit desktop distutils-r1 optfeature xdg
+
+DESCRIPTION="GTK image viewer for comic book archives"
+HOMEPAGE="https://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
+	x11-libs/gtk+:3[introspection]"
+BDEPEND="sys-devel/gettext"
+# Most tests are quite old and do not run
+RESTRICT="test"
+
+src_prepare() {
+	default
+
+	# Uncompress man page
+	gunzip share/man/man1/mcomix.1.gz || die
+}
+
+src_install() {
+	default
+
+	# Application meta files are not installed automatically anymore
+	domenu share/applications/*.desktop
+	local x
+	for x in 16 22 24 32 48 256 scalable; do
+		doicon -s ${x} share/icons/hicolor/${x}*/*
+	done
+	doman share/man/man1/mcomix.1
+	insinto /usr/share/metainfo
+	doins share/metainfo/*.xml
+	insinto /usr/share/mime/packages
+	doins share/mime/packages/*.xml
+}
+
+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 70caed9ab1ae..60b81574d92d 100644
--- a/media-gfx/mcomix/mcomix-9999.ebuild
+++ b/media-gfx/mcomix/mcomix-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..12} )
-inherit distutils-r1 git-r3 optfeature xdg
+inherit desktop distutils-r1 git-r3 optfeature xdg
 
 DESCRIPTION="GTK image viewer for comic book archives"
 HOMEPAGE="https://mcomix.sourceforge.net"
@@ -31,8 +31,23 @@ src_prepare() {
 	default
 
 	# Uncompress man page
-	gunzip mcomix.1.gz || die
-	sed -e "s/mcomix.1.gz/mcomix.1/" -i setup.py || die
+	gunzip share/man/man1/mcomix.1.gz || die
+}
+
+src_install() {
+	default
+
+	# Application meta files are not installed automatically anymore
+	domenu share/applications/*.desktop
+	local x
+	for x in 16 22 24 32 48 256 scalable; do
+		doicon -s ${x} share/icons/hicolor/${x}*/*
+	done
+	doman share/man/man1/mcomix.1
+	insinto /usr/share/metainfo
+	doins share/metainfo/*.xml
+	insinto /usr/share/mime/packages
+	doins share/mime/packages/*.xml
 }
 
 pkg_postinst() {