restrict beautifulsoup dep (bug 421877). remove old

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

5 files changed, 21 insertions, 132 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/Manifest b/app-misc/anki/Manifest
index aa4d1167e5c4..84f6db5b717c 100644
--- a/app-misc/anki/Manifest
+++ b/app-misc/anki/Manifest
@@ -1,8 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST anki-1.2.11.tgz 1886062 RMD160 ca54d788b9af51aa2996b2743b6c4164a5391468 SHA1 9c6dd8e227841e574b56c51ee439d298bd51ac27 SHA256 ca075fd0c0d6851d22046de8f6fa90d7c442cdd4a6783f7c6ffad7fbc46f5089
-DIST anki-1.2.6.tgz 1836019 RMD160 21ed402b4e8c1feabb7670fec1333f2363e547b1 SHA1 7e8e5e3dd8ebde1ccafce0b2e2d31bfaa024ff03 SHA256 36d79a596719d252c42c12d468c36397c7a6d28e8b010ec646cd5b09ab47db50
-DIST anki-1.2.9.tgz 2361506 RMD160 d93f5dbd0c8610656fb573e0b4fc0dd23dd65ef1 SHA1 29645a4c4a0035d25bb84c020869b6f977845eb1 SHA256 1b5188a7cf8b2ad88c0ec4774bf25edf0c5ace2f6c8ccf1b82e8fe5a65ec4025
-EBUILD anki-1.2.11.ebuild 1391 RMD160 96bbe397e77a527ea3bdc705b3f0438db4ca15a7 SHA1 f5d63a7a4e15b53053827e54dcfc0141d1abbea5 SHA256 bcb606507dce600d5cfad04dc82c98a9a895cf4a64aaae1ff0d56fe0122c3214
-EBUILD anki-1.2.6.ebuild 1412 RMD160 469559ccddc97bb8317bc1c14a6e00dd2e365bc6 SHA1 bd7ff89252194520b4e2f5e97725b7ee08e3abf3 SHA256 e23819c050812e9e2d1a7e1970aeec4c72ba5a01aeefdd5e366ed186fc9396c6
-EBUILD anki-1.2.9.ebuild 1363 RMD160 5ac288d53a02419ee73ca99364ffbb8ac4aa05b3 SHA1 cdeca3947f7c1de76b189c8412a53ebf185567dd SHA256 0bc1813d7478a620ecae686edd97045da898fe2541ad87d528a59ca75555ad44
-MISC ChangeLog 6928 RMD160 4e04d646c39adf10e5db42888a23aa75b007be3d SHA1 2c206d91c91840ac0f2fb19e274d20a0aef6c2ce SHA256 d64b86d87b59950a3f3f07ba44e2a3d915680accbdca80318d54c711749071d9
+EBUILD anki-1.2.11.ebuild 1440 RMD160 2bac88947ead0b40df952353352d3f51639ed9df SHA1 9d485c02069487ac42f9129fd23069d0a292f109 SHA256 ff13a40a6464813784040582c7d31e02f57a34ae273ef9a11b9d2ecb88d55ba6
+MISC ChangeLog 7092 RMD160 2868a336be5a0dc12a27b2a9c33811887b79afc2 SHA1 3dd0943c6c1717f274948d5069e008fb396c1678 SHA256 1cd864432dcdb10601350e888613963f7a282160dbc1778e0a84678266482e49
 MISC metadata.xml 897 RMD160 facce53526b70a3173caef210d2d7e8debf56944 SHA1 c80e1ce202365df86831ba92052538dac91dd2ad SHA256 5032f7817a59d5c0dd8d9c65ff75a1cd21696dcf9858319860ba73972b160449
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk/h5wcACgkQid6yGVZcMrynUQEA4ev85Tx7zc/4Wz/PqE4jWDGQ
+XQl68OWN5dpghigUTsUA/0Zn4WTc1l1qO4EboPJUPEs14vqXFo25Rb2Zcs3hR7D1
+=kB/g
+-----END PGP SIGNATURE-----
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"
-}