Bump to 1.2.9 fixing bug 377207, remove old

(Portage version: 2.1.10.10/cvs/Linux i686)

8 files changed, 10 insertions, 357 deletions

diff --git a/app-misc/anki/ChangeLog b/app-misc/anki/ChangeLog
index 529ebc6927b3..e3b2ff58f952 100644
--- a/app-misc/anki/ChangeLog
+++ b/app-misc/anki/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-misc/anki
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/anki/ChangeLog,v 1.35 2011/04/02 13:20:07 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/anki/ChangeLog,v 1.36 2011/08/13 22:38:32 tomka Exp $
+
+*anki-1.2.9 (13 Aug 2011)
+
+  13 Aug 2011; Thomas Kahle <tomka@gentoo.org> -anki-0.9.9.8.6-r1.ebuild,
+  -files/anki-0.9.9.8.6-sqlalchemy-0.6.patch, -anki-1.0.ebuild,
+  -anki-1.0.1.ebuild, -anki-1.2.2.ebuild, -anki-1.2.7.ebuild,
+  -anki-1.2.8.ebuild, +anki-1.2.9.ebuild:
+  Bump to 1.2.9 fixing bug 377207, remove old
 
 *anki-1.2.8 (02 Apr 2011)
 
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
deleted file mode 100644
index 41bef9b62309..000000000000
--- a/app-misc/anki/anki-0.9.9.8.6-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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.4 2010/08/22 12:50:21 maekke 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.7[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/anki-1.0.1.ebuild b/app-misc/anki/anki-1.0.1.ebuild
deleted file mode 100644
index 0cf859536ead..000000000000
--- a/app-misc/anki/anki-1.0.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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-1.0.1.ebuild,v 1.1 2010/08/23 11:56:28 patrick 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.7[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/anki-1.0.ebuild b/app-misc/anki/anki-1.0.ebuild
deleted file mode 100644
index d88e114a2153..000000000000
--- a/app-misc/anki/anki-1.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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-1.0.ebuild,v 1.1 2010/08/18 17:27:44 patrick 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.7[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/anki-1.2.2.ebuild b/app-misc/anki/anki-1.2.2.ebuild
deleted file mode 100644
index dedfb110a880..000000000000
--- a/app-misc/anki/anki-1.2.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/anki/anki-1.2.2.ebuild,v 1.1 2011/01/15 23:52:49 patrick 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.7[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/anki-1.2.8.ebuild b/app-misc/anki/anki-1.2.8.ebuild
deleted file mode 100644
index 480a5640bf50..000000000000
--- a/app-misc/anki/anki-1.2.8.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/anki/anki-1.2.8.ebuild,v 1.1 2011/04/02 13:20:07 patrick 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.7[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/anki-1.2.7.ebuild b/app-misc/anki/anki-1.2.9.ebuild
index 547a0f3c4286..7b4d662629f2 100644
--- a/app-misc/anki/anki-1.2.7.ebuild
+++ b/app-misc/anki/anki-1.2.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/anki/anki-1.2.7.ebuild,v 1.1 2011/03/18 04:49:38 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/anki/anki-1.2.9.ebuild,v 1.1 2011/08/13 22:38:32 tomka Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -42,7 +42,6 @@ PYTHON_MODNAME="anki ankiqt"
 
 src_prepare() {
 	distutils_src_prepare
-#	epatch "${FILESDIR}/${P}-sqlalchemy-0.6.patch"
 }
 
 src_compile() {
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
deleted file mode 100644
index 08b0eb54b0c8..000000000000
--- a/app-misc/anki/files/anki-0.9.9.8.6-sqlalchemy-0.6.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- 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)