4 files changed, 136 insertions, 2 deletions
diff --git a/app-misc/anki/ChangeLog b/app-misc/anki/ChangeLog
index 1e5d9d9894b9..3e29603cc9be 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.47 2012/11/05 08:41:39 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/anki/ChangeLog,v 1.48 2012/12/22 05:09:55 radhermit Exp $
+
+*anki-2.0.3-r1 (22 Dec 2012)
+
+  22 Dec 2012; Tim Harder <radhermit@gentoo.org> +anki-2.0.3-r1.ebuild,
+  +files/anki-2.0.3-httplib2-0.7.7.patch:
+  Revision bump. Fix runtime issue with httplib2-0.7.7 (patch by Arfrever).
 
 *anki-2.0.3 (05 Nov 2012)
 
diff --git a/app-misc/anki/Manifest b/app-misc/anki/Manifest
index 61431b8f2d06..f876a31543c7 100644
--- a/app-misc/anki/Manifest
+++ b/app-misc/anki/Manifest
@@ -1,8 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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
 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 7834 SHA256 babb5dbda00b447f335bb596b070fbc21ac2b6c3fec88527532eceba174ff7b8 SHA512 3d1519bad8ddccf8e64d89c3c759d88f9a40ecf1fdf01075b5fd48cabdf4422af8ded6b56c0a33df714544eca9e66a27691f83db077345104e7537fe702226dd WHIRLPOOL af00f3fb6a52fd92632b7f39bddad6a5fa28bdba860e343bd4f5ba210562b8812c5236dca594206ab20b7fcf16a0cbfc862b637809ace15178b251d5b3ae0a29
+MISC ChangeLog 8057 SHA256 63f8527f94812fafd9e352c425365425cc97343f23b1954a583229c3c3d827be SHA512 871a009cc80cb154f3438b41ab5a5a47314a4561c551e2085350c99a20a0d24e3c2834d6c581f42942fbc498326fa54a5294a79d6f7cf836419b7f031a1dc74d WHIRLPOOL 00a68d06d4b23ad7f592283c11f5ba78598bb5c54498d583e670a384dfd6bce0cca070d5ee5a820f72d3b29d8e302eb65efd97f2b9dc4de1f4649c3f281dd550
 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
+-----END PGP SIGNATURE-----
diff --git a/app-misc/anki/anki-2.0.3-r1.ebuild b/app-misc/anki/anki-2.0.3-r1.ebuild
new file mode 100644
index 000000000000..7d78a25c4eff
--- /dev/null
+++ b/app-misc/anki/anki-2.0.3-r1.ebuild
@@ -0,0 +1,74 @@
+# 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-r1.ebuild,v 1.1 2012/12/22 05:09:55 radhermit 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() {
+	epatch "${FILESDIR}"/${P}-httplib2-0.7.7.patch
+	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/files/anki-2.0.3-httplib2-0.7.7.patch b/app-misc/anki/files/anki-2.0.3-httplib2-0.7.7.patch
new file mode 100644
index 000000000000..8a77f250fb6f
--- /dev/null
+++ b/app-misc/anki/files/anki-2.0.3-httplib2-0.7.7.patch
@@ -0,0 +1,38 @@
+https://github.com/dae/anki/issues/1
+
+--- libanki/anki/sync.py
++++ libanki/anki/sync.py
+@@ -16,6 +16,15 @@
+ HTTP_TIMEOUT = 30
+ HTTP_PROXY = None
+ 
++try:
++    # httplib2 >=0.7.7
++    _proxy_info_from_environment = httplib2.proxy_info_from_environment
++    _proxy_info_from_url = httplib2.proxy_info_from_url
++except AttributeError:
++    # httplib2 <0.7.7
++    _proxy_info_from_environment = httplib2.ProxyInfo.from_environment
++    _proxy_info_from_url = httplib2.ProxyInfo.from_url
++
+ # Httplib2 connection object
+ ######################################################################
+ 
+@@ -42,7 +51,7 @@
+ def _setupProxy():
+     global HTTP_PROXY
+     # set in env?
+-    p = httplib2.ProxyInfo.from_environment()
++    p = _proxy_info_from_environment()
+     if not p:
+         # platform-specific fetch
+         url = None
+@@ -59,7 +68,7 @@
+             elif 'http' in r:
+                 url = r['http']
+         if url:
+-            p = httplib2.ProxyInfo.from_url(url, _proxyMethod(url))
++            p = _proxy_info_from_url(url, _proxyMethod(url))
+     HTTP_PROXY = p
+ 
+ def _proxyMethod(url):