4 files changed, 9 insertions, 126 deletions
diff --git a/app-misc/anki/ChangeLog b/app-misc/anki/ChangeLog
index 89f5acd33b09..1367cb5a1c47 100644
--- a/app-misc/anki/ChangeLog
+++ b/app-misc/anki/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/anki
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/anki/ChangeLog,v 1.41 2012/05/22 01:32:57 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/anki/ChangeLog,v 1.42 2012/06/20 15:06:38 tomka Exp $
+
+  20 Jun 2012; Thomas Kahle <tomka@gentoo.org> -anki-1.2.6.ebuild,
+  -anki-1.2.9.ebuild, anki-1.2.11.ebuild:
+  restrict beautifulsoup dep (bug 421877).  remove old
 
   22 May 2012; Jeff Horelick <jdhore@gentoo.org> anki-1.2.11.ebuild:
   marked x86 per bug 416463
diff --git a/app-misc/anki/anki-1.2.11.ebuild b/app-misc/anki/anki-1.2.11.ebuild
index a13bdeaed0d4..a8c84e659ac8 100644
--- a/app-misc/anki/anki-1.2.11.ebuild
+++ b/app-misc/anki/anki-1.2.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/anki/anki-1.2.11.ebuild,v 1.3 2012/05/22 01:32:57 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/anki/anki-1.2.11.ebuild,v 1.4 2012/06/20 15:06:38 tomka Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -17,7 +17,9 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="furigana +graph latex recording +sound"
 
-RDEPEND="dev-python/beautifulsoup
+# beautifulsoup-4 is not supported in 1.2.11
+RDEPEND="
+	<dev-python/beautifulsoup-4
 	>=dev-python/PyQt4-4.7[X,svg,webkit]
 	>=dev-python/sqlalchemy-0.5.3
 	>=dev-python/simplejson-1.7.3
diff --git a/app-misc/anki/anki-1.2.6.ebuild b/app-misc/anki/anki-1.2.6.ebuild
deleted file mode 100644
index f1d125dbe201..000000000000
--- a/app-misc/anki/anki-1.2.6.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.6.ebuild,v 1.3 2011/03/21 11:39:55 hwoarang 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.9.ebuild b/app-misc/anki/anki-1.2.9.ebuild
deleted file mode 100644
index 4a0453e10140..000000000000
--- a/app-misc/anki/anki-1.2.9.ebuild
+++ /dev/null
@@ -1,61 +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.9.ebuild,v 1.3 2011/09/13 09:23:18 hwoarang 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
-}
-
-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"
-}