Bump to 2.0.4

Package-Manager: portage-2.1.11.38/cvs/Linux x86_64
Manifest-Sign-Key: 0x89DEB219565C32BC

4 files changed, 22 insertions, 95 deletions

diff --git a/app-misc/anki/ChangeLog b/app-misc/anki/ChangeLog
index 3e29603cc9be..e5374ee04c7f 100644
--- a/app-misc/anki/ChangeLog
+++ b/app-misc/anki/ChangeLog
@@ -1,6 +1,12 @@
 # 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.48 2012/12/22 05:09:55 radhermit Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/anki/ChangeLog,v 1.49 2013/01/10 12:12:35 tomka Exp $
+
+*anki-2.0.4 (10 Jan 2013)
+
+  10 Jan 2013; Thomas Kahle <tomka@gentoo.org> +anki-2.0.4.ebuild,
+  -anki-2.0.2.ebuild, -anki-2.0.3.ebuild:
+  Bump to 2.0.4
 
 *anki-2.0.3-r1 (22 Dec 2012)
 
diff --git a/app-misc/anki/Manifest b/app-misc/anki/Manifest
index f876a31543c7..b9de98392c9c 100644
--- a/app-misc/anki/Manifest
+++ b/app-misc/anki/Manifest
@@ -3,22 +3,17 @@ Hash: SHA256
 
 AUX anki-2.0.3-httplib2-0.7.7.patch 1101 SHA256 c54e80100554dd4c41986f984da338e0f29743e67fef35582af056b2f0b95352 SHA512 8d4397bb5545fa2b05696c53819f42d0f82105fa14666ff179a86a95e3fc86851bd101495a8b3e5c4309cc85533c979b8c66358be50da678f77206be0a68c9cc WHIRLPOOL 83bf6dd76d36cbd0e3516960b0fa730e0cd181a58c72dcccb873437ecbdb842e61e3ad221774038b76c842bee66106a2d9776302e1be0b8d9888dd859376a010
 DIST anki-1.2.11.tgz 1886062 SHA256 ca075fd0c0d6851d22046de8f6fa90d7c442cdd4a6783f7c6ffad7fbc46f5089 SHA512 f04ba85afb146c912c77fa047a74dfae34b2900bc4a0c5ab86d2c0787fa69339bd354d1def7083e74ac16da3e8e03efcf49808d817bc502ebb69944cd2ad4d9c WHIRLPOOL dbd445cc4439b6b582a11ae62b813f1773c15b90412d12aa3f06db07a778137d9c0aa06710354a2ab88055887f6d2e44db0f260ebaa4e6042012012a7ee3ee55
-DIST anki-2.0.2.tgz 2821066 SHA256 26176d49b10e2b06ba37f3b8fecd6559f42f262089ea20f317db01ea64ca6cd5 SHA512 1f1392857689b26690938156e7c3b58cfd0e3d82c3fe0fbfcde3f3a48f6d902f5b29408b93e45eb04f56bec76a8c5f1f89c6cb079145da2bbd3fc181690e553f WHIRLPOOL a3202487eebd6a9d5aeef400697ca0facfee130388297098c0b116939606cc9142ec374f8b83294c63d6331626e1c93792fd56a3d6dc2967eaade4ff40e83f32
 DIST anki-2.0.3.tgz 2823500 SHA256 9b34259dc0489d7a97e5193567c78cfec82a53ce4e35318d55640e1c2a05be2c SHA512 49071f128d4783c31c9ac3c8bdb02fcbc6b15b946a8d50559d58adc93e78ef20935bb504172b16f6e17d10f1e6196cee353583d91ae0d298ebaf3f36e1e8ab48 WHIRLPOOL d57d91374c447b76cbeca52bd892bf2a3c2cc985b22cbcc45bdf825d417f4e90ebe22123956f8242fa2f0fd3df6afe3b661bde123e83fbd8bc24bdeff1643f58
+DIST anki-2.0.4.tgz 2877891 SHA256 faa9c96003515fa0125da489bdb8a3d601aff1767d92fa13ff8f411c3d8569c5 SHA512 d9adb67236a740e6ad69b77c864dbe300bfc2531bc4003539f43d9c27454969d5118bfa742568b885fb0d7980981540ba63ec5cf07914e872e1e85f62b8b5518 WHIRLPOOL c242c4884a19beb93a5d6e6f78cae9e5d61cef34b11572280218b15026500b82ad9065faead28df035baec3b19970c5c989c22aefa81dab506cb5a9582844647
 EBUILD anki-1.2.11.ebuild 1440 SHA256 ff13a40a6464813784040582c7d31e02f57a34ae273ef9a11b9d2ecb88d55ba6 SHA512 6c4b18d6087c71249a47b44a6cbaf6133103230e4ff150185a50620d1ab9cdcc5f133bae6db87624049105989dbd460e3a5193c742c09a0a279363b4edf3fafc WHIRLPOOL 9fed483c49cd2848eabcc7a2284b48355e5a695bb756a37961bd13541cc7efa36e4d378979233bb125ea80f1abf346e1550f26df81c796f4f0fd63fde2686e95
-EBUILD anki-2.0.2.ebuild 1675 SHA256 33388a86a5ae63c28fa84cfe20ddd301d92ba45972cf7b758b9736dc77f2dec6 SHA512 7e6a74fd7cff7e0504262c1e99995e43a13177d4e3218a34e4315a4de8af518001bcc95dfef700d0da42958b50717c5d2a7520a75d8cbe31fc6c9bd1c1241265 WHIRLPOOL 8008d45792833fdf5813a3e8fc0621aea0779b4e875863893e7a95c693dc956dc38315d2a7cbffcb8c6f069f4ed1ae9f0be4f44eda2b11c7f4513852a53d1db5
 EBUILD anki-2.0.3-r1.ebuild 1730 SHA256 08134d218c4366e8ef34decd7ac164aeff41d9ef7cdb01138bdffba4c5d6d25b SHA512 bf0b5575dd8f86fa6164facfe17e60ffdc8bbb10d1fe096eaf7782c281233fd2d8c8e7e961db5a1e03d41056bdc21b18e838235639d0261b23fd8b15dfacd9d8 WHIRLPOOL c5d676c3f87750acbeed0b7790bf98fcfe056e7a40d505f3c76ef047598d0105e39f8d1ce3d4f50af5b7928752720cb60f7bc86db27596b2cdd70e049e1a98b3
-EBUILD anki-2.0.3.ebuild 1677 SHA256 a4e554d96a5cd801d8ea1e2daaf1274a8075b347e1baec47a6afb54f6aeefc75 SHA512 219e34056a8ff385b6a8935bb101d70aa84e41a7155a262a9b9eb48f255ef3f519baa247c9debc6a6b810fdf148b6638396b52a80c8ee4bcad993ba3b2f11e7b WHIRLPOOL 560695fd55c5f91c215c81e18313b2560f52edd5160297d067d452a03487d90e916bf348365bab466178ac776a86a94ac25b5aab3e8cc380f65d17d6d92d4c65
-MISC ChangeLog 8057 SHA256 63f8527f94812fafd9e352c425365425cc97343f23b1954a583229c3c3d827be SHA512 871a009cc80cb154f3438b41ab5a5a47314a4561c551e2085350c99a20a0d24e3c2834d6c581f42942fbc498326fa54a5294a79d6f7cf836419b7f031a1dc74d WHIRLPOOL 00a68d06d4b23ad7f592283c11f5ba78598bb5c54498d583e670a384dfd6bce0cca070d5ee5a820f72d3b29d8e302eb65efd97f2b9dc4de1f4649c3f281dd550
+EBUILD anki-2.0.4.ebuild 1646 SHA256 a0303aa900002e82bfe71f69dad88378508491592ca41ece05e1b62ad872a47c SHA512 d8b2111c752bdd51fdacf699eb5a211b1a223865abb5ef6c5f74b2c8ca3771645da2030711f7ad8d7c72cb76e82e36eb6395ad0c8938ce4cc4ecc04144352b69 WHIRLPOOL 8336fdf7d671628fedc6cec74d86dd431c4aaa4c0fd18527e5cd29fc9bd5dc381f1def0ab37024d03d81848a7566e729f95cddce69c9a5d2ff6bdade884f0761
+MISC ChangeLog 8206 SHA256 c9d5726229c9e27fb35bf0edbeeafe8741010146fa2fdf06b93be366f4a0cb6e SHA512 672d36365d8e4985f49efff7660dbce81a95c4b0cd23b73b498c1ec96315a7f655893c1682393b09178e10e48d22230e296f56d092f8c15ef8b26159904e6f54 WHIRLPOOL 68ef33b32271cdcfc8b34ce3a82ba34c4f3e42a85e89ffee6dfc4bf08c2cdbeea18649615280bee5377c24f493061bcc621ca1cfdc31ada4973311d21de47490
 MISC metadata.xml 897 SHA256 ed91a95ce646c96ee2fa60df2a7f195eea48ac2ceef08f4ebd9543592954754a SHA512 581f62ab903615d700218565d0e51cd365abb9153784de460cce7b0d3c88e1023ea4706a27a49048a595387d787084179a9f8ab9cd52b8d713b3924e77a3160d WHIRLPOOL 8a9cae45777615a60a741d4f9cf789e4c961f32d1dc236033d54d0d110acdc26a82652d18db8477e36c9cad95e1f073a8d8297ac251052744004102ce5de3046
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ1UCnAAoJEEqz6FtPBkyjl30H/igX9LVQZtGl5Lj10p/6s0C4
-xoRHMpsp0B7i98E49+seFf+mDQ72eHdnQL0O52gwMMGbbl4cs+hL9cxr5XuxWJNn
-fQ4o+D9T3wF8p6oZBc5zOksz1qVHhJs+VPNBo05O0DExwIbuEkxn3EVKGMXfivuw
-cp3iCyuXSrX7HWk9e0AvqsytuokYRe3SlzS/vPTmku8k+7dfdqZ2stNLMUcIVAY2
-3TUAMsqCb1JBzGGsOXUiGWxS9Jwd0ChZaG2p4QNtUEpiY4tBot1WvJKe/GfWEokJ
-5/Fh+lCPf/IPDtLt9kemVVVgVbORyXHYeYjyLMInRMt4d5SxhBYgos/DID/yAXc=
-=drzf
+iF4EAREIAAYFAlDusDQACgkQid6yGVZcMrwT6gEA4hhscxNcK/SXfF3VJ7vzi7qM
+UDj6aMhP1elDsPuBLD8A/3ExVlBs35mlSOV5VU/KgC3AiBySeFVZE262BykdbadK
+=K5uS
 -----END PGP SIGNATURE-----
diff --git a/app-misc/anki/anki-2.0.3.ebuild b/app-misc/anki/anki-2.0.3.ebuild
deleted file mode 100644
index 96442faeaea9..000000000000
--- a/app-misc/anki/anki-2.0.3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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-2.0.3.ebuild,v 1.1 2012/11/05 08:41:39 patrick Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.6"
-PYTHON_USE_WITH="sqlite"
-
-inherit eutils python
-
-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="dev-python/PyQt4[X,svg,webkit]
-	 >=dev-python/httplib2-0.7.4
-	 dev-python/beautifulsoup:python-2
-	 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_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	rm -r libanki/thirdparty || die
-	python_convert_shebangs -r 2 .
-}
-
-# Nothing to configure or compile
-src_configure() {
-	true;
-}
-
-src_compile() {
-	true;
-}
-
-src_install() {
-	exeinto /usr/bin/
-	doexe anki
-
-	doicon ${PN}.png
-	domenu anki.desktop
-
-	doman anki.1
-
-	dodoc README README.development README.translating
-	insinto "$(python_get_sitedir)"
-	doins -r aqt libanki/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"
-		elog "The mobile clients for Anki 2 are still under development."
-	fi
-}
diff --git a/app-misc/anki/anki-2.0.2.ebuild b/app-misc/anki/anki-2.0.4.ebuild
index 251299de9df0..2ff9c6a65913 100644
--- a/app-misc/anki/anki-2.0.2.ebuild
+++ b/app-misc/anki/anki-2.0.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/anki/anki-2.0.2.ebuild,v 1.2 2012/11/02 17:31:54 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/anki/anki-2.0.4.ebuild,v 1.1 2013/01/10 12:12:35 tomka Exp $
 
 EAPI=4
 
@@ -34,7 +34,7 @@ pkg_setup(){
 }
 
 src_prepare() {
-	rm -r libanki/thirdparty || die
+	rm -r thirdparty || die
 	python_convert_shebangs -r 2 .
 }
 
@@ -49,16 +49,15 @@ src_compile() {
 
 src_install() {
 	exeinto /usr/bin/
-	doexe anki
+	doexe anki/anki
 
 	doicon ${PN}.png
-	domenu anki.desktop
+	domenu ${PN}.desktop
+	doman ${PN}.1
 
-	doman anki.1
-
-	dodoc README README.development README.translating
+	dodoc README README.development
 	insinto "$(python_get_sitedir)"
-	doins -r aqt libanki/anki
+	doins -r aqt anki
 }
 
 pkg_preinst() {