app-misc/mnemosyne: Bump and remove old.

Old ebuild is now throwing errors due to no supported python
implementation, so let's just punt it.

diff --git a/app-misc/mnemosyne/Manifest b/app-misc/mnemosyne/Manifest
index d3218ff12c7cd54db8dbe42d548c679dc3df5978..c4af0e2d13a1b71da3ef6c9cf2d82bfb77257e44 100644 (file)
--- a/app-misc/mnemosyne/Manifest
+++ b/app-misc/mnemosyne/Manifest
@@ -1,3 +1,4 @@
-AUX mnemosyne-fix-desktop-categories.patch 323 BLAKE2B 263e6312ac495257b035730c87ad28c6c36d78b82221d1476ade672e8a41d46d31607b1b6df9729e1d02491c16a34593771a1219b6d4119afaec7a071d948afd SHA512 e35e7f8953e83c4e59efa8846da5c4587105d80e5606ff2162c7686094942b50167a275651eee1e1faa1fa486a0afac2b5cc1c53ea816f54306d01125a66d09a
-DIST Mnemosyne-2.6.tar.gz 1271314 BLAKE2B 48ec9413117970de8c93d6a0aca83966b11e97a1397ca0563887583691680cadfc33694057a5e233fd6a221acc281c0c475912713794bed3476d305706b07c80 SHA512 04cdf38d4827532c4e03c3b7645f369099da2926a3611638decdc9c252b4622ece2f945970cffed0e6d75410fba9c5c8c3304a9076ab03abaf030a35f8acfc54
-EBUILD mnemosyne-2.6.ebuild 937 BLAKE2B 07b8a59b9797fb5098d08aaa621c4459bbfbe548eb38a44069160fea8a520d9e57e3d84a09e84292a41ee1e3711a30d51e51906a296d9ff406baf3feb5d0f0d1 SHA512 5d963cb783da2d1e6fbc493327ffdf1be0568063a34c6dd3e1771c470eaf43442ff6be79fcb54bf61bfddb5c244bb788c618d8a0f29d4d1eadda21d7d6600cae
+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
+DIST Mnemosyne-2.7.3.tar.gz 1284741 BLAKE2B eca7f5a8df5d8526991cc213fdaa548ad533535b0ba991f053859cfc51058fb2b6ecb6d12302f1030f96347ff444c942071a13453abad05a105f53b15fe82391 SHA512 3230ec5e595ff5191729e675dea52ff22b6bfdcda524e27a87879ce9162622f4ea9fdf169777da32b9e77f4785c5cffe8c2472664863518fd2997e4ad030ed98
+EBUILD mnemosyne-2.7.3.ebuild 1131 BLAKE2B 3f7da2ad42b30cc67cfa559c6378f736dc1e7877c3a2869c29f8ecb0727e958ca258ef3e5f5d73c87a16a76367ee5bf2ae8086531316c13527ee06ef975dec27 SHA512 2bf7e3d85a85b7c96e35eba0c16fb60e4d447c34a281650a54c75890c98493da1f21c6c0f319c1b7baceb01e9fceb3e7eaa7520c8857b69b8792df6bf261a14a

diff --git a/app-misc/mnemosyne/files/mnemosyne-2.7.3-fix-desktop-categories.patch b/app-misc/mnemosyne/files/mnemosyne-2.7.3-fix-desktop-categories.patch
new file mode 100644 (file)
index 0000000..65ac12a
--- /dev/null
+++ b/app-misc/mnemosyne/files/mnemosyne-2.7.3-fix-desktop-categories.patch
@@ -0,0 +1,13 @@
+diff --git a/mnemosyne.desktop.orig b/mnemosyne.desktop
+index 1cdaf83..82e8e87 100644
+--- a/mnemosyne.desktop.orig
++++ b/mnemosyne.desktop
+@@ -3,7 +3,7 @@ Name=Mnemosyne
+ Comment=A flash card program to make your review process more efficient
+ Exec=mnemosyne %f
+ Icon=mnemosyne
+-Categories=Education
++Categories=Education;
+ Keywords=education;learning;flash cards;
+ Terminal=false
+ Type=Application

diff --git a/app-misc/mnemosyne/files/mnemosyne-2.7.3-no-google.patch b/app-misc/mnemosyne/files/mnemosyne-2.7.3-no-google.patch
new file mode 100644 (file)
index 0000000..7af8a10
--- /dev/null
+++ b/app-misc/mnemosyne/files/mnemosyne-2.7.3-no-google.patch
@@ -0,0 +1,15 @@
+diff --git a/mnemosyne/libmnemosyne/__init__.py.orig b/mnemosyne/libmnemosyne/__init__.py
+index c2e498d..79b8ced 100644
+--- a/mnemosyne/libmnemosyne/__init__.py.orig
++++ b/mnemosyne/libmnemosyne/__init__.py
+@@ -156,10 +156,6 @@ class Mnemosyne(Component):
+           "Translator"),
+          ("mnemosyne.libmnemosyne.pronouncer",
+           "Pronouncer"),
+-         ("mnemosyne.libmnemosyne.translators.google_translator",
+-          "GoogleTranslator"),
+-         ("mnemosyne.libmnemosyne.pronouncers.google_pronouncer",
+-          "GooglePronouncer"),
+          ("mnemosyne.libmnemosyne.languages.afrikaans",
+           "Afrikaans"),
+          ("mnemosyne.libmnemosyne.languages.albanian",

diff --git a/app-misc/mnemosyne/files/mnemosyne-fix-desktop-categories.patch b/app-misc/mnemosyne/files/mnemosyne-fix-desktop-categories.patch
deleted file mode 100644 (file)
index 0cc8eae..0000000
--- a/app-misc/mnemosyne/files/mnemosyne-fix-desktop-categories.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/mnemosyne.desktop        2014-08-07 02:43:06.000000000 -0400
-+++ b/mnemosyne.desktop        2015-04-05 13:22:55.203727842 -0400
-@@ -3,6 +3,6 @@
- Comment=A flash card program to make your review process more efficient
- Exec=mnemosyne %f
- Icon=mnemosyne
--Categories=Education
-+Categories=Education;
- Terminal=false
- Type=Application

diff --git a/app-misc/mnemosyne/mnemosyne-2.6.ebuild b/app-misc/mnemosyne/mnemosyne-2.6.ebuild
deleted file mode 100644 (file)
index 83955e5..0000000
--- a/app-misc/mnemosyne/mnemosyne-2.6.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright © 2015-2018 Nick Bowler
-# License GPLv3+: GNU General Public License version 3 or later.
-# There is NO WARRANTY, to the extent permitted by law.
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_5 python3_6 )
-
-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="$PYTHON_DEPS
-       >=dev-python/PyQt5-5.6[widgets,webengine,sql,$PYTHON_USEDEP]
-       >=dev-python/cherrypy-3.2[$PYTHON_USEDEP]
-       >=dev-python/webob-1.4[$PYTHON_USEDEP]
-       dev-python/matplotlib[$PYTHON_USEDEP]"
-DEPEND="$RDEPEND
-       dev-python/setuptools[$PYTHON_USEDEP]
-       app-text/dos2unix"
-
-S=$WORKDIR/$MY_P
-
-PATCHES=("$FILESDIR/mnemosyne-fix-desktop-categories.patch")
-
-src_prepare () {
-       find -name '*.py' -exec dos2unix {} +
-       dos2unix ChangeLog README.md mnemosyne.desktop
-       default
-}

diff --git a/app-misc/mnemosyne/mnemosyne-2.7.3.ebuild b/app-misc/mnemosyne/mnemosyne-2.7.3.ebuild
new file mode 100644 (file)
index 0000000..0699cc5
--- /dev/null
+++ b/app-misc/mnemosyne/mnemosyne-2.7.3.ebuild
@@ -0,0 +1,45 @@
+# 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
+}