Bump to 1.2.9 fixing bug 377207, remove old

Package-Manager: portage-2.1.10.10/cvs/Linux i686

9 files changed, 23 insertions, 371 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/Manifest b/app-misc/anki/Manifest
index f067e0515c9d..eab50f1c34d7 100644
--- a/app-misc/anki/Manifest
+++ b/app-misc/anki/Manifest
@@ -1,17 +1,16 @@
-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
-DIST anki-1.0.1.tgz 1834494 RMD160 52ee0c3454ee84bba4dbb5809b4862b1cd6dd102 SHA1 0122951e7445a4e06223587e0f14ec464379a790 SHA256 9b7e3e3edbb3845287c07fa81d72adfcec8f006ff3b6ce7d8dce948b9648c23a
-DIST anki-1.0.tgz 1830350 RMD160 b6e44dd78ae980b2cd4584c92ad5932e22997b9c SHA1 d4485e1ce0008be02990cee80aef9cb6bfa5c9a5 SHA256 c9b01f8f4a979bf7a239dba906d8f10624986ce424136e9c328da3349e2cefde
-DIST anki-1.2.2.tgz 1804828 RMD160 17ffaa4caf22a5fc4b56f5ef5d4b26f8f058ae46 SHA1 d4aa2299aaac01cd2b18b458e332e112d9a3c8de SHA256 a89e061dd85f0670ae69b5afcbd0fa66670112862dba88e67647c65350b41814
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST anki-1.2.6.tgz 1836019 RMD160 21ed402b4e8c1feabb7670fec1333f2363e547b1 SHA1 7e8e5e3dd8ebde1ccafce0b2e2d31bfaa024ff03 SHA256 36d79a596719d252c42c12d468c36397c7a6d28e8b010ec646cd5b09ab47db50
-DIST anki-1.2.7.tgz 1868832 RMD160 9c3c609317ee2af78fad7138c45d9206c11de30b SHA1 017266e84f72053489fed985e381f427db028b12 SHA256 25b680c5ef363eaa76fe71bcdde7ed9836f1a3a57b79316eee1cdce1fe4aa467
-DIST anki-1.2.8.tgz 1899720 RMD160 4049e86dd568623625931b213ac0cd96606031cd SHA1 bbed6be7c9ad8534ddc77ee1bd4bcc14c6986add SHA256 ff2067e3a987ad47c9986b5f616aef1ac37b0b6d24480be8d0ecca3531eab0b2
-EBUILD anki-0.9.9.8.6-r1.ebuild 1416 RMD160 11786f5384bd22f3ebb5c89218ebb1fe0fd67dbc SHA1 6774f11b1b21910f698180065c623328542b2be2 SHA256 dfb298597e4c6f4088ef5cde8b1cbc3c333dd0ec75cba490f2fda41bd0c48058
-EBUILD anki-1.0.1.ebuild 1413 RMD160 5fe4aa9bd5f1ef7be02f651f2c9c28199b1bc3c7 SHA1 266de6d1a41c8aff402c11929f574eb8111e10bd SHA256 dc699feea30dc8fc4028b19beb489de68d8473f8beb51559b89fbf6898f6e346
-EBUILD anki-1.0.ebuild 1411 RMD160 5736c9e6f278f303ad5444c7397bcdc8bf3207d6 SHA1 f898fd02d8e19ae8afc55456d328c1cd172b6024 SHA256 eeb7e98d407c0fb8e241c82f1209cf70b726d0d0d9fc4c5b6b8c0eceb06ef5ad
-EBUILD anki-1.2.2.ebuild 1413 RMD160 269b005c815caacc3bc09814aa7d4f1e23095c50 SHA1 f8de6201b0f46987aceb3361d0c4b8569993af2a SHA256 e544dedaac3373c4bfd620239ed11afc242632a8ae1656d331bfd0a6507eaf41
+DIST anki-1.2.9.tgz 2361506 RMD160 d93f5dbd0c8610656fb573e0b4fc0dd23dd65ef1 SHA1 29645a4c4a0035d25bb84c020869b6f977845eb1 SHA256 1b5188a7cf8b2ad88c0ec4774bf25edf0c5ace2f6c8ccf1b82e8fe5a65ec4025
 EBUILD anki-1.2.6.ebuild 1412 RMD160 469559ccddc97bb8317bc1c14a6e00dd2e365bc6 SHA1 bd7ff89252194520b4e2f5e97725b7ee08e3abf3 SHA256 e23819c050812e9e2d1a7e1970aeec4c72ba5a01aeefdd5e366ed186fc9396c6
-EBUILD anki-1.2.7.ebuild 1413 RMD160 2c0f39ea7c491e02d611b583e257a792a4aee1b5 SHA1 fe592651bb77287eab1ce8ee57ab697f1180351f SHA256 246d808f9592f9325a8f35f9a8e502121fa667d454060f9a28732e90632808c3
-EBUILD anki-1.2.8.ebuild 1413 RMD160 a0f40a116586f00112d67273004129a989287ac8 SHA1 2f3271a6672c8eeb58c77543db24c8844f883fbe SHA256 2405179188acd709003f157a06568dddcf6cbef36ba268d1228c120699d129a2
-MISC ChangeLog 6089 RMD160 865242c2a0c9413c256195e46429804579eee83c SHA1 074a8e6966059edc7410a96695395b9571b7099d SHA256 e4620577fff945ed27404a0657da9273fbd208fbae73c7ad6a393fa7889aca8e
+EBUILD anki-1.2.9.ebuild 1362 RMD160 7c00f9d3588de2b7910635ef35bf04559e046d16 SHA1 e06631550fdefdb39fa81ee5fa42439c84e2e641 SHA256 f8c8d25788263b2e670ac9654aa7598d470051cef545b8980385406d3148f0c7
+MISC ChangeLog 6403 RMD160 7703c18cb116ddc84c72ae4dafc6f6ef86f9ec98 SHA1 65789cd222ba8fa8d919912b124191a4fe28db16 SHA256 e8d625a760e5537a97b18cbe819dbb2d1c46e385f344b35d6232f104912d2ab8
 MISC metadata.xml 919 RMD160 06628a333bdba7f2c20b41a499bb8ba3e9146730 SHA1 373f8bd0be71ab582c17b08544dfd62f0b606154 SHA256 b0431e6d67fb51ab744cb35261d030f23a536af14afa20e3f4bbbe2cb7eeb674
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iF4EAREIAAYFAk5HAPIACgkQodBTJSDyo64GKgD/cuiZSAreqTcqLiRPtG8JGLpO
+bFqE7ZIB3anU2eaLpP0A/1203dEtyJnnUXRoCzpWEPmDa8ni69iLaul8iKWFbXVS
+=WZX/
+-----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
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)