app-misc/mnemosyne: Adjust icon installation.

There are several sizes of icons provided in the package; we can
install them all to the appropriate places.

Further, remove the old versions with outdated PYTHON_COMPAT; the
oldest of which is now spewing python eclass errors.

diff --git a/app-misc/mnemosyne/Manifest b/app-misc/mnemosyne/Manifest
index 0b6157e4deee6c088be3734f2c249c4272218423..6831b1d4d36d4beab9b013b9a07c9a2c349d02b5 100644 (file)
--- a/app-misc/mnemosyne/Manifest
+++ b/app-misc/mnemosyne/Manifest
@@ -1,9 +1,5 @@
 AUX mnemosyne-2.7.3-fix-desktop-categories.patch 399 BLAKE2B fc511905e2e49b9a1baefb628aa7cfe5ceed6b7a08bc6c58294fb6a7b9a3786c36d95dc760318e8cf6eb70e1428ae1f0addbfeab4276154b6703a0fbf9e678b7 SHA512 53766c5fd1c9b3cc16238b0a69b4aaada9a3532ffaa9f2fcd2899842d504ec8926ea0b1cf6c9ca7d151d5c4092d836ab4b657628427f80000828835aff529285
 AUX mnemosyne-2.7.3-no-google.patch 692 BLAKE2B b06c9abaf08f685ce0d96853551162ad0780900beb6ca0b78c51758b2ea9c9f9485dbe1be6136cfbbdebd8a4c54878969b093d060091d5888c27389194e20901 SHA512 c7b313249351ee444852e44ce9acc1681e39c779c09c36042b34d12cc465f0f94e87c5299ac771c31b92bcc6350d4315546a014b8076046b5e5a628f3d94ccca
 AUX mnemosyne-2.9-no-google.patch 1148 BLAKE2B fabcc52922d8ad002f9e151b12af848c4338ce67055284942a0371d6cd6b3c41568b8956ea9950ae1f1f905b0694702755051929301a9925c72a66220551dc5f SHA512 ddb8d339f5dbe22c4d8d7b8148c7f92fca6b05e9b9dd697d4d5565e77e3935f3116e11af24f5704a3c2bf8c588243b43f1c390c7080650f4f4185fd0e76fa15c
-DIST Mnemosyne-2.7.3.tar.gz 1284741 BLAKE2B eca7f5a8df5d8526991cc213fdaa548ad533535b0ba991f053859cfc51058fb2b6ecb6d12302f1030f96347ff444c942071a13453abad05a105f53b15fe82391 SHA512 3230ec5e595ff5191729e675dea52ff22b6bfdcda524e27a87879ce9162622f4ea9fdf169777da32b9e77f4785c5cffe8c2472664863518fd2997e4ad030ed98
-DIST Mnemosyne-2.8.tar.gz 1307066 BLAKE2B 05f6540ac8114a4de3f58313d8f99e733c0fdd6991b18656829ccf66c71f534561af766c063a595e42340dd8d42b01bc078e8e74d38a4fe1f6150a192bc48a27 SHA512 82bae3faf251e53e9edea13230037cd454980dc38c255de4b4c9a85833ca838555c945ef8bc4850f6caedf15066a7187658868c9c2769278524c13f152e410b5
 DIST Mnemosyne-2.9.tar.gz 1321351 BLAKE2B a867e173087e3ecbf771f4f0c1bf5f2f4e710698814eb5a2ccd7b0a7c185d126efe84d24b637cc07fe05dccae68fa10f116295ffc6c9ba64783a277cf79f5755 SHA512 2912af04d7a691802e171091991a504affe00a8e99c9debde7b83d99975622d01d0907027aa90f3a47aff1db9fbdaa720a40ec6c7c7f29999e28427669f24d8a
-EBUILD mnemosyne-2.7.3.ebuild 1131 BLAKE2B 3f7da2ad42b30cc67cfa559c6378f736dc1e7877c3a2869c29f8ecb0727e958ca258ef3e5f5d73c87a16a76367ee5bf2ae8086531316c13527ee06ef975dec27 SHA512 2bf7e3d85a85b7c96e35eba0c16fb60e4d447c34a281650a54c75890c98493da1f21c6c0f319c1b7baceb01e9fceb3e7eaa7520c8857b69b8792df6bf261a14a
-EBUILD mnemosyne-2.8.ebuild 1176 BLAKE2B 636c5741c253edc5eb8b0742375addc5265686f5a2a9c06afab61e3fd79926687d0ddca3156502a95b14e8deff7d74cf7c64db9ebab385a1a01e40c27f6f83bf SHA512 87648ac27bbd93ff8461713bf52e2102bc391e4da69213a1e0dba0a0be495af2d0b711c2b042d3ecb2362290430fcd1b09dc44472aee077adcda3a6fa0d50617
-EBUILD mnemosyne-2.9.ebuild 1180 BLAKE2B e8304c2b3a4cc4b95c324126325d33909c45fad2e68bad5f0de79c237bade6144cd2c9a2da7cd67deb7f9621aa6cf4872d37a7eac1f37bb5c0a128d4a745c71b SHA512 5b6be2acf52348b7f17c749810fb476d9d2717a9158ca641fe6a0280ffcf53e32bb3415c32093cff1e896d8ab9305e8658a56ca1dde02ffe2140df04e11e14d7
+EBUILD mnemosyne-2.9-r1.ebuild 1427 BLAKE2B 70e1b29e47377d5d6b9bb0bf6b2f7a633c0d5c382ca41de1f7ed1e78415dbd948e93711735ff11c77786e5f12075d0846e17cbe09064e50640bb40efa1a45d04 SHA512 0165b11bd30963bbf6e32926792ab73d051f7fe8e0b8c63fd48eb00e6e134b46426b41abf2a10e38772f4a46c39f90d2617f25fe2da1af12d1e104fb9dde554e

diff --git a/app-misc/mnemosyne/mnemosyne-2.7.3.ebuild b/app-misc/mnemosyne/mnemosyne-2.7.3.ebuild
deleted file mode 100644 (file)
index 0699cc5..0000000
--- a/app-misc/mnemosyne/mnemosyne-2.7.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright © 2015-2018,2021 Nick Bowler
-# License GPLv3+: GNU General Public License version 3 or any later version.
-# This is free software: you are free to change and redistribute it.
-# There is NO WARRANTY, to the extent permitted by law.
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_8 )
-
-inherit distutils-r1
-
-MY_P=Mnemosyne-$PV
-
-DESCRIPTION="A flash card tool to optimize your learning process"
-HOMEPAGE="https://mnemosyne-proj.org/"
-SRC_URI="mirror://sourceforge/mnemosyne-proj/$MY_P.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=dev-python/PyQt5-5.6[widgets,sql,$PYTHON_USEDEP]
-       || (
-               dev-python/PyQtWebEngine[$PYTHON_USEDEP]
-               dev-python/PyQt5[webengine]
-       )
-       >=dev-python/cheroot-5[$PYTHON_USEDEP]
-       >=dev-python/webob-1.4[$PYTHON_USEDEP]
-       dev-python/matplotlib[$PYTHON_USEDEP]"
-BDEPEND="app-text/dos2unix"
-
-S=$WORKDIR/$MY_P
-
-PATCHES=(
-       "$FILESDIR/mnemosyne-2.7.3-fix-desktop-categories.patch"
-       "$FILESDIR/mnemosyne-2.7.3-no-google.patch"
-)
-
-src_prepare () {
-       find -name '*.py' -exec dos2unix {} + || die
-       dos2unix ChangeLog README mnemosyne.desktop || die
-       dos2unix mnemosyne/pyqt_ui/mnemosyne || die
-
-       default
-}

diff --git a/app-misc/mnemosyne/mnemosyne-2.8.ebuild b/app-misc/mnemosyne/mnemosyne-2.8.ebuild
deleted file mode 100644 (file)
index 7b53005..0000000
--- a/app-misc/mnemosyne/mnemosyne-2.8.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright © 2015-2018,2021 Nick Bowler
-# License GPLv3+: GNU General Public License version 3 or any later version.
-# This is free software: you are free to change and redistribute it.
-# There is NO WARRANTY, to the extent permitted by law.
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-MY_P=Mnemosyne-$PV
-
-DESCRIPTION="A flash card tool to optimize your learning process"
-HOMEPAGE="https://mnemosyne-proj.org/"
-SRC_URI="mirror://sourceforge/mnemosyne-proj/$MY_P.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=dev-python/PyQt5-5.6[widgets,sql,$PYTHON_USEDEP]
-       || (
-               dev-python/PyQtWebEngine[$PYTHON_USEDEP]
-               dev-python/PyQt5[webengine]
-       )
-       >=dev-python/cheroot-5[$PYTHON_USEDEP]
-       >=dev-python/webob-1.4[$PYTHON_USEDEP]
-       dev-python/matplotlib[$PYTHON_USEDEP]
-       dev-python/argon2-cffi[$PYTHON_USEDEP]"
-BDEPEND="app-text/dos2unix"
-
-S=$WORKDIR/$MY_P
-
-PATCHES=(
-       "$FILESDIR/mnemosyne-2.7.3-fix-desktop-categories.patch"
-       "$FILESDIR/mnemosyne-2.7.3-no-google.patch"
-)
-
-src_prepare () {
-       find -name '*.py' -exec dos2unix {} + || die
-       dos2unix ChangeLog README mnemosyne.desktop || die
-       dos2unix mnemosyne/pyqt_ui/mnemosyne || die
-
-       default
-}

diff --git a/app-misc/mnemosyne/mnemosyne-2.9.ebuild b/app-misc/mnemosyne/mnemosyne-2.9-r1.ebuild
similarity index 77%
rename from app-misc/mnemosyne/mnemosyne-2.9.ebuild
rename to app-misc/mnemosyne/mnemosyne-2.9-r1.ebuild
index 51eca7319629584b9a2eb0c19b7799345d309768..02d4814ac3b281ce7fa54a0376bacd9f5eadbbb3 100644 (file)
--- a/app-misc/mnemosyne/mnemosyne-2.9.ebuild
+++ b/app-misc/mnemosyne/mnemosyne-2.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright © 2015-2018,2021-2022 Nick Bowler
+# Copyright © 2015-2018,2021-2023 Nick Bowler
 # License GPLv3+: GNU General Public License version 3 or any later version.
 # This is free software: you are free to change and redistribute it.
 # There is NO WARRANTY, to the extent permitted by law.
@@ -7,7 +7,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{9..10} )
 
-inherit distutils-r1
+inherit desktop distutils-r1
 
 MY_P=Mnemosyne-$PV
 
@@ -44,3 +44,12 @@ src_prepare () {
 
        default
 }
+
+src_install () {
+       distutils-r1_src_install
+
+       rm -f "$D/usr/share/icons/mnemosyne.png"
+       newicon -s 256 pixmaps/mnemosyne_large.png $PN.png
+       newicon -s 128 pixmaps/mnemosyne.png $PN.png
+       newicon -s  22 pixmaps/mnemosyne_small.png $PN.png
+}