bump to 2.0.26 and remove old

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x565C32BC

4 files changed, 11 insertions, 87 deletions

diff --git a/app-misc/anki/ChangeLog b/app-misc/anki/ChangeLog
index 23411448c0b2..79a48cb329f0 100644
--- a/app-misc/anki/ChangeLog
+++ b/app-misc/anki/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/anki
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/anki/ChangeLog,v 1.78 2014/04/12 16:48:48 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/anki/ChangeLog,v 1.79 2014/04/23 18:14:23 tomka Exp $
+
+*anki-2.0.26 (23 Apr 2014)
+
+  23 Apr 2014; Thomas Kahle <tom@gentoo.org> +anki-2.0.26.ebuild,
+  -anki-2.0.21.ebuild, -anki-2.0.22.ebuild:
+  bump to 2.0.26 and remove old
 
 *anki-2.0.24 (12 Apr 2014)
 
diff --git a/app-misc/anki/Manifest b/app-misc/anki/Manifest
index 16b05f4e0bfb..52b7994d2443 100644
--- a/app-misc/anki/Manifest
+++ b/app-misc/anki/Manifest
@@ -1,20 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST anki-2.0.20.tgz 3187458 SHA256 155a8495e45d506b6af2184970ecacbb4647c02dc31804a75ba810adce2347f0 SHA512 0bc29fe6bd1e4dbc09c91619c3e714be1577d3c217eeaf43abc5fb99359dcfa3fe6077bbec9ff549da26a0b49c4aafb13f6b24bf389b8cd37800be980d0a6ca4 WHIRLPOOL 6d100c8198882ff44359679847f766f9bf2a69e45ec5ef6bcf01042d666e08beb2fdcad199a50d86fb1b88a2a9946ef7b3fb080957eacede91617a7190b87472
-DIST anki-2.0.21.tgz 3204808 SHA256 f66599181b5d1867d36d5ddf74ac61dedc23efc52354eb8c9205836f634c3454 SHA512 77bd43c9243e3c69c94afd758ad75e534721efcb1c79fa4e99c761c66245f51fb971efe104cd0edd3896f1f58321f0ec1c62f89c6ec10f2be99713ad4f33cadd WHIRLPOOL 679abc6b1dcf4272f331f152b185fb249cec3fdfbee934d323e015858ab5e1b5c32500b35ca46aef2ca7a47785e3205a3b468b12155581f54082bc4c232a3537
-DIST anki-2.0.22.tgz 3208955 SHA256 4674a4797a5945f3c4a3f41cc322de07c8ae0fa8602a15e3d019820290fbd2ae SHA512 7053f13efe81a3458e5422682bd3f49c22808297ce912d7732c4bf8d167ad25cecc5b0d5fd7a9d5dc7db18f19b95c9dc301e1b72896505c5516143ae1b0d3132 WHIRLPOOL 32852b349f2f49aac7e63d6b14d4605083d2efdb115811576308c5c4580c03a96487ce58fca9f6b6b5169713ec6e3c626d67c328e180f34f7a56d032c7ef0815
 DIST anki-2.0.24.tgz 3270350 SHA256 a80ff90991e951d7fa32eb12fe87f00ddbd85d9b541bb6238ce5b420b4a2e31b SHA512 a6e60e31a2333adb0b382716c3fa207757beca0534f8f5b005cc8e77d02b355b84da5197623e0a5c3a3ad149ab982696c8487d4ae6487dd667611d4c7adca0e6 WHIRLPOOL c7c17692e1caee39f3e2949b084496d88928051022469d6b780e423a4489719eb201f704b9c6d0312b39d2ba7cdd30b2898131e9a7550220156f965d14ca9ee7
+DIST anki-2.0.26.tgz 3270514 SHA256 985c72c48b0b8c9dff2d9bbc3bf595c663c771287d6ae95d23d8af6ab6b02d70 SHA512 cbef964f154791f106136a37ed3d1d6c1c9d8a5ccd91afac20573123eab80e110e6da1a83fd83f5b90966109b24932f77ffc388fe4a9d28359f5b3be765f3529 WHIRLPOOL 9cedc1758c4887dc3e52c65d46c9ded3537b1d02aac6d8d7ab95bab2ddb393ad5ee2528604ab439d04f0269d0bf87bac80dca658b149e3e46b94940baf20e407
 EBUILD anki-2.0.20.ebuild 1624 SHA256 162eb17fa91656d6e75bfbc54cae158b9b21427bba540bd35df5741c3d4c9928 SHA512 72b8a17dccd34820d08f1eb74d653d3323ffa31a15cb33685c9f407a04b2dc0f43ae9ae5d511f877ee60c814a4ed0549babee05911e4557491aa0ad933301e78 WHIRLPOOL d10f277054ae5311e0da9fbd771e5024d8b1b658bf3ea2cedab2a006155b63569aa909e3a0c478b7c2607b350ca47742891c8c9a7134ad3de7eaeb8115646306
-EBUILD anki-2.0.21.ebuild 1628 SHA256 5232f91d1735161cee04da7e2f6aa36b766868f48a8dc581555e31f124a1d0eb SHA512 a6625b151833eedaecd96af6c50b085ad8ba4fe57b0b7f9592a2213cc1c6bade76e9c4f8ec6659f6eb16c2ca24f380db1a1ed929a959c8f1acc4e2dc27b1e2db WHIRLPOOL 4b50f71a8288a65e972d1bf8ecc5d86003c03f4fe43eb4a8f787b3b2d30822cd6628a90fc945d16df98492ce34859855c85a6589b9c392edf750d26eeae4aebb
-EBUILD anki-2.0.22.ebuild 1628 SHA256 0f9c6b124f4352c1dd0f08bea4c79b76add059b3d87223034ec46f9f2a1d9d14 SHA512 22ac136d821972483e9042dfc70617c6bc5bf803a791be435891bbd45e2426f84af6ea41a0ac3213d8601b09c57899c53c1d56e22635769b893cf023f847d633 WHIRLPOOL e17da25334849cf125812e995d4b0d7b05d41632c6e582cbf93bf68f49b0c8caca25e1073a4aa22145516037e161c85141f7c854c66f4aa9c26dc51b4739e88e
 EBUILD anki-2.0.24.ebuild 1628 SHA256 aaa84a7718a603d18bf8cbe39bfbded2ba81bf0977b17d971009272ee28f4c12 SHA512 c55bf83bc4fa136e789b7c4399cb6dc5d2a4ba2c22b61e39755c3de66dd5d3aa221fe8fb5f7cd64e0013465fbe7206cfa87dc18782fd9cc3d35e744ee01d358c WHIRLPOOL 6ba577cdf65e081e3653ac42a5f3c122dc0921e707151af57af7a734235b7837226ffaf8f18c950be23d646917cd8be34362a94f1d57ff9ceabef03b7017f67a
-MISC ChangeLog 11897 SHA256 7ce8c7aeb104a446c9b4124e00b6430f666f4f2f5ce2b2b0ae6b01541ff4a367 SHA512 e04076abb83d4117609d309b943ef70b7621355e0c7123fae1878855e1f763fb1903a73ec13d39c8a35784b9eeb9c095821f282d9e943dd4b16661678bb81135 WHIRLPOOL f0083224dd500940062dccfb8b93398f96d9c9cc086b0166397270f9869e2671db41fcb556954f2f9a7c605eb823a052497f5277e18265f4adb314041fdadd57
+EBUILD anki-2.0.26.ebuild 1628 SHA256 1175917ab25b3d2d2ec35d200ae332ddf33294754e8fea436b770786e3588267 SHA512 a5091844f63a0c08ac65c24b430a1d0dbc2e17f7787fe019efde46ad4227ed9e98062519fe9fe9f127566ce52edc8ed11b5c15e3caa57d4b7d3edba4353fad62 WHIRLPOOL 59cb36b0fb18352476d3a6258bf9eae5741a08c179bd5362c60a89409105797d5b324f9997f73ce3a66e37f54a45e8713b218c23662ee0f379ee91ebaeb4e41e
+MISC ChangeLog 12068 SHA256 44f9ba7af7c80a46aac6eaa0d44ce131c6c54a94031bd0292fef1ba811835dae SHA512 d4702456e8242df286dc956ae7bb0cc225032b6ddcc4dc025b8620678818dca2e348cc3c38dfd9fe54170948bd4736abdd07d700e35df7a8470cc031dd2039d2 WHIRLPOOL 2d512eb92e5228b96141b47317de55c9e11ae66b358a155273ca46eadaa3daaf5cc05f86906010ea724d3bb4bea025c145eaddb056fd5588af504bf7e160d43b
 MISC metadata.xml 752 SHA256 24ab3347c88cbfc3277da0fee9bab86a68d86565bbc0e1a9168998f54eb7a021 SHA512 4c0492455131a4ab214c68cbed806102de4df1894380cf8a4ad1f0c4a593b2738d50a4bf6e6dde15dbfa914b0075a636469d366f3e7cceaf7c8098369cff6c37 WHIRLPOOL 3062f8b144f7102ae7bc6516b8ee8d5820430535420967c6d9093a94e9ad4dc26cc500f3e6cd4207f0555529f7d748a0086d8149aa48bdc4fe39c4c97c69d813
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iF4EAREIAAYFAlNJbm8ACgkQid6yGVZcMrzHfwD/YfXVwO2vK6Fx4Qznzf1OX6lS
-J2yAhka37jdw2MlnIOQBAKALl91hWquJch0CQbcJ6duGx6WZdWtYP6ScPPOCNKoZ
-=s7rx
------END PGP SIGNATURE-----
diff --git a/app-misc/anki/anki-2.0.22.ebuild b/app-misc/anki/anki-2.0.22.ebuild
deleted file mode 100644
index 21fc3969c584..000000000000
--- a/app-misc/anki/anki-2.0.22.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/anki/anki-2.0.22.ebuild,v 1.1 2014/02/07 14:23:53 tomka Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_6 python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit eutils python-single-r1
-
-DESCRIPTION="A spaced-repetition memory training program (flash cards)"
-HOMEPAGE="http://ichi2.net/anki/"
-SRC_URI="http://ankisrs.net/download/mirror/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="latex +recording +sound"
-
-RDEPEND="${PYTHON_DEPS}
-	 dev-python/PyQt4[X,svg,webkit]
-	 >=dev-python/httplib2-0.7.4
-	 dev-python/beautifulsoup:python-2
-	 dev-python/send2trash
-	 recording? ( media-sound/lame
-				  >=dev-python/pyaudio-0.2.4 )
-	 sound? ( media-video/mplayer )
-	 latex? ( app-text/texlive
-			  app-text/dvipng )"
-DEPEND=""
-
-pkg_setup(){
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	rm -r thirdparty || die
-	sed -i -e "s/updates=True/updates=False/" \
-		aqt/profiles.py || die
-}
-
-# Nothing to configure or compile
-src_configure() {
-	true;
-}
-
-src_compile() {
-	true;
-}
-
-src_install() {
-	doicon ${PN}.png
-	domenu ${PN}.desktop
-	doman ${PN}.1
-
-	dodoc README README.development
-	python_domodule aqt anki
-	python_doscript anki/anki
-}
-
-pkg_preinst() {
-	if has_version "<app-misc/anki-2" ; then
-		elog "Anki 2 is a rewrite of Anki with many new features and"
-		elog "a new database format.  On the first run your decks are"
-		elog "converted to the new format and a backup of your Anki-1"
-		elog "decks is created.  Please read the following:"
-		elog "http://ankisrs.net/anki2.html"
-	fi
-}
diff --git a/app-misc/anki/anki-2.0.21.ebuild b/app-misc/anki/anki-2.0.26.ebuild
index e2c6ee744cbf..d043d3c2be6b 100644
--- a/app-misc/anki/anki-2.0.21.ebuild
+++ b/app-misc/anki/anki-2.0.26.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/anki/anki-2.0.21.ebuild,v 1.1 2014/01/24 11:22:05 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/anki/anki-2.0.26.ebuild,v 1.1 2014/04/23 18:14:23 tomka Exp $
 
 EAPI=5