Set SUPPORT_PYTHON_ABIS (bug #311513). Support sqlalchemy-0.6.0 (bug #316459).

Package-Manager: portage-HEAD/cvs/Linux x86_64

4 files changed, 116 insertions, 21 deletions

diff --git a/app-misc/anki/ChangeLog b/app-misc/anki/ChangeLog
index 3393462d3a73..346051bd377b 100644
--- a/app-misc/anki/ChangeLog
+++ b/app-misc/anki/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/anki
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/anki/ChangeLog,v 1.21 2010/03/09 12:14:36 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/anki/ChangeLog,v 1.22 2010/05/21 21:39:22 arfrever Exp $
+
+*anki-0.9.9.8.6-r1 (21 May 2010)
+
+  21 May 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +anki-0.9.9.8.6-r1.ebuild, +files/anki-0.9.9.8.6-sqlalchemy-0.6.patch:
+  Set SUPPORT_PYTHON_ABIS (bug #311513). Support sqlalchemy-0.6.0 (bug #316459).
 
   09 Mar 2010; Jonathan Callen <abcd@gentoo.org> anki-0.9.9.8.1.ebuild,
   anki-0.9.9.8.2.ebuild, anki-0.9.9.8.4.ebuild, anki-0.9.9.8.5.ebuild,
diff --git a/app-misc/anki/Manifest b/app-misc/anki/Manifest
index a285405efe5b..89ac46422c69 100644
--- a/app-misc/anki/Manifest
+++ b/app-misc/anki/Manifest
@@ -1,22 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST anki-0.9.9.8.1.tgz 1882369 RMD160 243588642379da1baab3437fe7dd43373f27fb23 SHA1 c607675bf07e7c623b722252fc11d403a02e9770 SHA256 562a3760ced7166320560516648ab8e4f8263cefcc0d6c8bfccd92650ee1a6b8
-DIST anki-0.9.9.8.2.tgz 1587917 RMD160 22a2aae9f044fdc4d24610d5ecc3ba238921d82d SHA1 54ba0b27369ad7516327c29e2c20ca1fef810fd9 SHA256 07567e2db18f42c1246b7b5aa9cc1fdec35b4a15311745751b993590504ce266
-DIST anki-0.9.9.8.4.tgz 1594542 RMD160 3df57bc0d506f95187844d1d87496ffa09a4e334 SHA1 dd2c1f344930eec5f17b1db9d1f4e7f454701a74 SHA256 c2730a83bc36e2e29b239503d44d60da72ae7c5befdb2f86082eed8ed1194f3b
-DIST anki-0.9.9.8.5.tgz 1231899 RMD160 e221e7f9ea72ff4d682a6c77b8e806718cf83e50 SHA1 30914477cf4878c1c865a3872ef085cd8b70bc76 SHA256 ddf104c589242183dfbf7b284edfe0b1a0952f3f3ea8f701c9eabdc6acd5e416
+AUX anki-0.9.9.8.6-sqlalchemy-0.6.patch 1195 RMD160 0a04c778eb542a089d4ec5224d56fda6c0bf3a07 SHA1 5003ff07c4b362f5ad1dd9794f36352e3ea76117 SHA256 8c069f546bb3aa149b7cf86cd2af385edd387dc7125662aa9db334822172c29d
 DIST anki-0.9.9.8.6.tgz 1676780 RMD160 4634310ae2c16d86de6e4a5b66d71696e94529b0 SHA1 dd478a2d6500d963691aa5a2e2611bbd5c4c5836 SHA256 6e15bc9de91aa85228dc9eb08cdfc07db53942c1205e29302c86c94b7828834f
-EBUILD anki-0.9.9.8.1.ebuild 1549 RMD160 07851e63a9eeb73bf76847f1412c56b60a760939 SHA1 48aac441b1a6dcc37d70a1ca2931292a1b2aca97 SHA256 a50d857a2dad7381ea884e3e05d8a76c2cafcb7d6899244f46e32576f5d7ca88
-EBUILD anki-0.9.9.8.2.ebuild 1549 RMD160 3f3282dc0abbd82c6be65ac76d80b2387e64938c SHA1 b1999fdccd9f4cc3c01e05c7fedda8325863e68b SHA256 0af43ea2900237db41bbc4c1464ef5cf4a8120a5f213a19328cf8e0464571e38
-EBUILD anki-0.9.9.8.4.ebuild 1549 RMD160 56a7d15078766c1c15050c88bb654bbd6bca375d SHA1 f07f7910054481a0213b1a15f7cf3a333f5ba8ff SHA256 fa3a4e82086408fcf7530faa2dc4beaf3fac5893e38d5a0b7e848a3601dfbb42
-EBUILD anki-0.9.9.8.5.ebuild 1549 RMD160 0ea6bcdcf0ea94c04b490b10a0c1c32902e90325 SHA1 6c48871265524e8623f1de183a841bac9b0e26a9 SHA256 06af55e5746d0d830dd96990bc7f97aa0a5b4486ef8fd3788732dbf875f94d94
-EBUILD anki-0.9.9.8.6.ebuild 1570 RMD160 b15008db176397bfe3077516b923de12700e1c20 SHA1 c023ecb4b2ac4ca176382d94e39728e6823c6be2 SHA256 4d2501a232c67bb9c64bd349bef6e99d0d3931125e354b08fcf0457488c057ab
-MISC ChangeLog 4275 RMD160 d3180b8ab48f5c5a0fc8856bf5f20958267d357a SHA1 c125a27e562dac14b2d080ab993c2e6e5f8f7678 SHA256 b4eb4968af4e9d21ad8e7d9a6e2ac4b47cda4715ca64faa8c3131e71e5785a44
+EBUILD anki-0.9.9.8.6-r1.ebuild 1420 RMD160 60d0aa7a9f77a866079b5e98d8ea2f74814c72bc SHA1 6b787143aafac05c8f8be9b0af90790acd4a3c43 SHA256 dd93ce87f53056e1c00f250d79838afa6637f3442b590188513babae9cd573b2
+MISC ChangeLog 4541 RMD160 4b03245c4d5a4be1ff2344b8e28c15c9cdf65136 SHA1 089d3d081fd58af5e937e305b48aade448964195 SHA256 d01297f4994233b857be23b5f1e5bf1210d1454bf10a140fa813bd111d6be2a7
 MISC metadata.xml 776 RMD160 5638e961de471b30c1169741914850fa635ffcd7 SHA1 4becb15ac2b395c388d22f3108d2c409c7d5893d SHA256 0c85139de61968b06cfae984825f87b1755454890f543c6ab960f38f1adb9552
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuWO7IACgkQOypDUo0oQOpbWwCdGWZs/w1VdnKO59oggNVE/X3I
-argAnj2vGFy7IN+hUhK7Ir5i41CDKKov
-=/kHn
------END PGP SIGNATURE-----
diff --git a/app-misc/anki/anki-0.9.9.8.6-r1.ebuild b/app-misc/anki/anki-0.9.9.8.6-r1.ebuild
new file mode 100644
index 000000000000..f3b1c84edb52
--- /dev/null
+++ b/app-misc/anki/anki-0.9.9.8.6-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/anki/anki-0.9.9.8.6-r1.ebuild,v 1.1 2010/05/21 21:39:22 arfrever Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit distutils eutils
+
+DESCRIPTION="A spaced-repetition memory training program (flash cards)"
+HOMEPAGE="http://ichi2.net/anki/"
+SRC_URI="http://anki.googlecode.com/files/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="furigana +graph latex recording +sound"
+
+RDEPEND="dev-python/beautifulsoup
+	>=dev-python/PyQt4-4.4[X,svg,webkit]
+	>=dev-python/sqlalchemy-0.5.3
+	>=dev-python/simplejson-1.7.3
+	|| ( >=dev-python/pysqlite-2.3.0 >=dev-lang/python-2.5[sqlite] )
+	latex? ( app-text/dvipng )
+	furigana? ( app-i18n/kakasi )
+	graph? (
+		dev-python/numpy
+		>=dev-python/matplotlib-0.91.2
+	)
+	recording? (
+		media-sound/sox
+		dev-python/pyaudio
+		media-sound/lame
+	)
+	sound? ( media-video/mplayer )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools"
+RESTRICT_PYTHON_ABIS="3.*"
+
+PYTHON_MODNAME="anki ankiqt"
+
+src_prepare() {
+	distutils_src_prepare
+	epatch "${FILESDIR}/${P}-sqlalchemy-0.6.patch"
+}
+
+src_compile() {
+	distutils_src_compile
+	cd libanki
+	distutils_src_compile
+}
+
+src_install() {
+	distutils_src_install
+	cd libanki
+	distutils_src_install
+	cd ..
+
+	doicon icons/${PN}.png || die
+	make_desktop_entry ${PN} ${PN} ${PN} "Education"
+}
diff --git a/app-misc/anki/files/anki-0.9.9.8.6-sqlalchemy-0.6.patch b/app-misc/anki/files/anki-0.9.9.8.6-sqlalchemy-0.6.patch
new file mode 100644
index 000000000000..08b0eb54b0c8
--- /dev/null
+++ b/app-misc/anki/files/anki-0.9.9.8.6-sqlalchemy-0.6.patch
@@ -0,0 +1,44 @@
+--- libanki/anki/db.py
++++ libanki/anki/db.py
+@@ -65,6 +65,27 @@
+             self._lockDB()
+         self._seen = True
+ 
++    def save(self, obj):
++        # compat
++        if sqlalchemy.__version__.startswith("0.4."):
++            self._session.save(obj)
++        else:
++            self._session.add(obj)
++
++    def clear(self):
++        # compat
++        if sqlalchemy.__version__.startswith("0.4."):
++            self._session.clear()
++        else:
++            self._session.expunge_all()
++
++    def update(self, obj):
++        # compat
++        if sqlalchemy.__version__.startswith("0.4."):
++            self._session.update(obj)
++        else:
++            self._session.add(obj)
++
+     def execute(self, *a, **ka):
+         x = self._session.execute(*a, **ka)
+         runHook("dbFinished")
+--- libanki/anki/deck.py
++++ libanki/anki/deck.py
+@@ -2841,7 +2841,10 @@
+     def _init(s):
+         "Add a new deck to the database. Return saved deck."
+         deck = Deck()
+-        s.save(deck)
++        if sqlalchemy.__version__.startswith("0.4."):
++            s.save(deck)
++        else:
++            s.add(deck)
+         s.flush()
+         return deck
+     _init = staticmethod(_init)