Version bump. Changed to furigana use flag for furigana support. Fixed pysqlite dependency. Using setup.py for install. Removed psyco recommendation (it is no longer used).

(Portage version: 2.2_rc12/cvs/Linux 2.6.25-gentoo-r6-grey01 x86_64)

3 files changed, 24 insertions, 28 deletions

diff --git a/app-misc/anki/ChangeLog b/app-misc/anki/ChangeLog
index 374a55f723d6..868c0083a39c 100644
--- a/app-misc/anki/ChangeLog
+++ b/app-misc/anki/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-misc/anki
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/anki/ChangeLog,v 1.1 2008/10/02 23:13:39 hncaldwell Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/anki/ChangeLog,v 1.2 2008/10/16 17:54:59 hncaldwell Exp $
+
+*anki-0.9.8.5 (16 Oct 2008)
+
+  16 Oct 2008; Heath Caldwell (hncaldwell) <hncaldwell@csupomona.edu>
+  metadata.xml, +anki-0.9.8.5.ebuild:
+  Version bump. Changed to furigana use flag for furigana support. Fixed
+  pysqlite dependency. Using setup.py for install. Removed psyco
+  recommendation (it is no longer used).
 
 *anki-0.9.8.1 (02 Oct 2008)
 
diff --git a/app-misc/anki/anki-0.9.8.1.ebuild b/app-misc/anki/anki-0.9.8.5.ebuild
index 90e0fd353da0..7f94acd17ac2 100644
--- a/app-misc/anki/anki-0.9.8.1.ebuild
+++ b/app-misc/anki/anki-0.9.8.5.ebuild
@@ -1,46 +1,38 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/anki/anki-0.9.8.1.ebuild,v 1.1 2008/10/02 23:13:39 hncaldwell Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/anki/anki-0.9.8.5.ebuild,v 1.1 2008/10/16 17:54:59 hncaldwell Exp $
 
-EAPI=1
+EAPI=2
 
-NEED_PYTHON=2.4
 inherit eutils multilib python
 
 DESCRIPTION="A spaced-repetition memory training program (flash cards)"
 HOMEPAGE="http://ichi2.net/anki/index.html"
-SRC_URI="http://ichi2.net/anki/download/${P}.tgz"
+SRC_URI="http://ichi2.net/${PN}/download/${P}.tgz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+graph kakasi +sound"
+IUSE="furigana +graph +sound"
 
 RDEPEND=">=dev-python/PyQt4-4.3
 	>=dev-python/sqlalchemy-0.4.1
 	>=dev-python/simplejson-1.7.3
-	>=dev-python/pysqlite-2.3.0
+	|| ( >=dev-python/pysqlite-2.3.0 >=dev-lang/python-2.5[sqlite] )
 	app-text/dvipng
+	furigana? ( app-i18n/kakasi )
 	graph? (
 		dev-python/numpy
 		>=dev-python/matplotlib-0.91.2
 	)
-	sound? ( dev-python/pygame )
-	kakasi? ( app-i18n/kakasi )"
+	sound? ( dev-python/pygame )"
 
 src_install() {
-	dodoc CREDITS
+	doicon icons/${PN}.png || die
 
-	python_version
-
-	insinto "/usr/$(get_libdir)/python${PYVER}/site-packages"
-	doins -r ankiqt libanki/anki
-
-	insinto "/usr/$(get_libdir)/python${PYVER}/site-packages/anki"
-	doins -r designer icons icons.qrc icons_rc.py libanki/samples
+	python setup.py install --root="${D}" || die
+	cd libanki
+	python setup.py install --root="${D}" || die
 
-	dobin ${PN}
-
-	doicon icons/${PN}.png
 	make_desktop_entry ${PN} ${PN} ${PN}.png "Education"
 }
 
@@ -48,10 +40,6 @@ pkg_postinst() {
 	python_version
 	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/ankiqt
 	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/anki
-
-	if use x86 && ! has_version dev-python/psyco; then
-		elog "Installing dev-python/psyco is strongly recommended."
-	fi
 }
 
 pkg_postrm() {
diff --git a/app-misc/anki/metadata.xml b/app-misc/anki/metadata.xml
index 08a0914bb6d4..8158782f0e00 100644
--- a/app-misc/anki/metadata.xml
+++ b/app-misc/anki/metadata.xml
@@ -9,15 +9,15 @@
 	<longdescription lang="en">
 		Anki is a program designed to help you remember facts
 		(such as words and phrases in a foreign language) as
-		easily, quickly and efficiently as possible.
+		quickly, easily and efficiently as possible.
 	</longdescription>
 	<use>
+		<flag name="furigana">
+			Enable support for furigana generation
+		</flag>
 		<flag name="graph">
 			Enable support for making graphs
 		</flag>
-		<flag name="kakasi">
-			Enable <pkg>app-i18n/kakasi</pkg> support for furigana generation
-		</flag>
 		<flag name="sound">
 			Enable support for adding sound to cards
 		</flag>