Fix bug 440948, move myself up in maintainer hierarchy, remove old.

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

6 files changed, 17 insertions, 165 deletions

diff --git a/app-misc/anki/ChangeLog b/app-misc/anki/ChangeLog
index 907098d08581..3f5289946bc4 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.45 2012/10/28 21:19:00 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/anki/ChangeLog,v 1.46 2012/11/02 17:31:54 tomka Exp $
+
+  02 Nov 2012; Thomas Kahle <tomka@gentoo.org> -anki-2.0.0-r1.ebuild,
+  -anki-2.0.0.ebuild, anki-2.0.2.ebuild, metadata.xml:
+  Fix bug 440948, move myself up in maintainer hierarchy, remove old.
 
 *anki-2.0.2 (28 Oct 2012)
 
diff --git a/app-misc/anki/Manifest b/app-misc/anki/Manifest
index eec72c787e62..23773ce0358a 100644
--- a/app-misc/anki/Manifest
+++ b/app-misc/anki/Manifest
@@ -2,18 +2,15 @@
 Hash: SHA256
 
 DIST anki-1.2.11.tgz 1886062 SHA256 ca075fd0c0d6851d22046de8f6fa90d7c442cdd4a6783f7c6ffad7fbc46f5089 SHA512 f04ba85afb146c912c77fa047a74dfae34b2900bc4a0c5ab86d2c0787fa69339bd354d1def7083e74ac16da3e8e03efcf49808d817bc502ebb69944cd2ad4d9c WHIRLPOOL dbd445cc4439b6b582a11ae62b813f1773c15b90412d12aa3f06db07a778137d9c0aa06710354a2ab88055887f6d2e44db0f260ebaa4e6042012012a7ee3ee55
-DIST anki-2.0.0.tgz 2727060 SHA256 2166857447d573fd7a99881de5f92898b24b3341f8271fbab9ec951167e5dc0f SHA512 56b42f6be6adc3f6ca0ae42eccbcbc28199548103560ba8c3c97aab8b58d4b69ae42d965debc26feab894e67fd6d997b6d03adc4782317a43cabf9d0a3a89ce5 WHIRLPOOL ce2d8a228230d993a46dfde171d203d7a6f923427bbe2702a2e27fcdeeac96e0d73222bb072ae72148601fd18e59394971955d016bd324d5c50c74682be0c2fa
 DIST anki-2.0.2.tgz 2821066 SHA256 26176d49b10e2b06ba37f3b8fecd6559f42f262089ea20f317db01ea64ca6cd5 SHA512 1f1392857689b26690938156e7c3b58cfd0e3d82c3fe0fbfcde3f3a48f6d902f5b29408b93e45eb04f56bec76a8c5f1f89c6cb079145da2bbd3fc181690e553f WHIRLPOOL a3202487eebd6a9d5aeef400697ca0facfee130388297098c0b116939606cc9142ec374f8b83294c63d6331626e1c93792fd56a3d6dc2967eaade4ff40e83f32
 EBUILD anki-1.2.11.ebuild 1440 SHA256 ff13a40a6464813784040582c7d31e02f57a34ae273ef9a11b9d2ecb88d55ba6 SHA512 6c4b18d6087c71249a47b44a6cbaf6133103230e4ff150185a50620d1ab9cdcc5f133bae6db87624049105989dbd460e3a5193c742c09a0a279363b4edf3fafc WHIRLPOOL 9fed483c49cd2848eabcc7a2284b48355e5a695bb756a37961bd13541cc7efa36e4d378979233bb125ea80f1abf346e1550f26df81c796f4f0fd63fde2686e95
-EBUILD anki-2.0.0-r1.ebuild 1676 SHA256 ad3730861ed198bc476d19eaddb0c3af78e393143bbb6c78687fea6b48895b0e SHA512 d27e19a87e260cc1f48f11523b8ae3209fa1f2cba873d61f950ccb0b18f1df5fee6e67bef780cd1ebd516ef8d720971a50c406c29541b4249156d49ebc5c49c1 WHIRLPOOL 59f0882ef5e28b972651ce3923050643ccf628f3ad035b774e91fbeafbc7edad17d71cf9059bcebad383e1b6b735f2dce4f962f15160c1dae957b71420b0400f
-EBUILD anki-2.0.0.ebuild 1724 SHA256 f64f4c2f3b5681b605a92312d90534dfedbad956af372dd844935ff79375191d SHA512 29b69fdeb314628bad3b6f0d4c9e8f398712de91649d9171d9f9167dffbd573523f03c5e52d117eef49dd1a30c18fc7ee151416ba7d656dd01dbbffb359d5cee WHIRLPOOL c32d752c9f9a508cb4712c419c3735f4aa32f21cd41d292fe1b1cd47c82772e6f61dece24c085940524df7f8023c91a60858c48efb207622bda3d7ee40751d58
-EBUILD anki-2.0.2.ebuild 1650 SHA256 dbf4971931fcec89c3f9c3160a0a312fa02ce40324024c9084b805b9fd95aeb8 SHA512 63463e90ee6a1b84047d65debca068af9d178f549f450b5ae400636199c7e43c287c90e46d1fb1ada152b4fd4b324169eb9f52abf7dbb70f3d55f895983e6b55 WHIRLPOOL 0671346f30c653b2456ca8987852dabcab5246395e260aa5905c88255d4cb958a8103d062cd12c08ece3e8a742172fc98501537de4874ee5bd44286e7aae9605
-MISC ChangeLog 7531 SHA256 086f67046a4a4f97d7930822d04bdb680ee4367150fcfd890f84008c0a5f158e SHA512 3740e3f47034367b56a3b953b6358609b5a00caee2da93ef59949ce7f6f172241cf03a265e08afea969c81ccd56be0478daa308fbc04d622ae985c4e61937701 WHIRLPOOL e04fbf9cfc86698fa0df1208ce74cdb4500b82eeef8ec477c8994b401f3c0b86eea239146e12afbea5495f00c24841c07431a3d7dd49305799b5e91e6f66ed8a
-MISC metadata.xml 897 SHA256 5032f7817a59d5c0dd8d9c65ff75a1cd21696dcf9858319860ba73972b160449 SHA512 2a3fd9a3cd00ca792ad2ca407108a3f7d4848144087bb4a2af4506ec7820323ba89d4a0e3ed1a94e59aa776628e2f201a9a2ff861d1e38b9813073a301acee16 WHIRLPOOL 0f723bf4dd78ee6fa80d649b63079e091af4104b785e58db110807035155f758db74eb636cb11c93cb196ab6364567b65d68283da1ab5f2b5a930358735f29bc
+EBUILD anki-2.0.2.ebuild 1675 SHA256 33388a86a5ae63c28fa84cfe20ddd301d92ba45972cf7b758b9736dc77f2dec6 SHA512 7e6a74fd7cff7e0504262c1e99995e43a13177d4e3218a34e4315a4de8af518001bcc95dfef700d0da42958b50717c5d2a7520a75d8cbe31fc6c9bd1c1241265 WHIRLPOOL 8008d45792833fdf5813a3e8fc0621aea0779b4e875863893e7a95c693dc956dc38315d2a7cbffcb8c6f069f4ed1ae9f0be4f44eda2b11c7f4513852a53d1db5
+MISC ChangeLog 7727 SHA256 6d3a36ac0821c409764b6560907d8e4f80607ecebbda94473cd1fff457ce2ff9 SHA512 8059e066fa347ed329fe5be278c892ad66945b0180237f387ecc19859f7e1aa0bf57df14f0488fb9c3118f7cdba883a1c55e7788ee7920969155c909bad66aaa WHIRLPOOL cb7dedc3195734098db601f1ccee2e81f28419ecc0518a6e896bf415a8f0d1fbcad5f4473c6fcd1b260cc44d0fcc9c077edfc9884f6934e6d904080133df93b7
+MISC metadata.xml 897 SHA256 ed91a95ce646c96ee2fa60df2a7f195eea48ac2ceef08f4ebd9543592954754a SHA512 581f62ab903615d700218565d0e51cd365abb9153784de460cce7b0d3c88e1023ea4706a27a49048a595387d787084179a9f8ab9cd52b8d713b3924e77a3160d WHIRLPOOL 8a9cae45777615a60a741d4f9cf789e4c961f32d1dc236033d54d0d110acdc26a82652d18db8477e36c9cad95e1f073a8d8297ac251052744004102ce5de3046
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlCNoUUACgkQid6yGVZcMrwXmwD/bzOzOVAxpuX4u1MMbbl1WdgL
-NH7lkojPAe67zfSdrTUBAM1dNdWadjpvb+RC2PrfCNI6DmUiiZ5UTkJDBkWnjnf1
-=+se9
+iF4EAREIAAYFAlCUA4wACgkQid6yGVZcMrzcPQD/YHH1RjDlgRSbGdCF1pQRRRW4
+ov+CwXKXKza0T4gz67UBAM8z9hgylDnA4sworz5fnYhXe3peCCGCwqmlfmSePKf4
+=dDq5
 -----END PGP SIGNATURE-----
diff --git a/app-misc/anki/anki-2.0.0-r1.ebuild b/app-misc/anki/anki-2.0.0-r1.ebuild
deleted file mode 100644
index fe7bf5535e7d..000000000000
--- a/app-misc/anki/anki-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,74 +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.0-r1.ebuild,v 1.1 2012/10/26 16:38:04 tomka Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.6"
-
-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=""
-
-S=${WORKDIR}/anki-2.0
-
-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.0.ebuild b/app-misc/anki/anki-2.0.0.ebuild
deleted file mode 100644
index c0298f2e1c83..000000000000
--- a/app-misc/anki/anki-2.0.0.ebuild
+++ /dev/null
@@ -1,76 +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.0.ebuild,v 1.1 2012/10/23 17:02:25 tomka Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.6"
-
-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=""
-
-S=${WORKDIR}/anki-2.0
-
-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
-
-	make_desktop_entry ${PN} ${PN} ${PN} "Education"
-}
-
-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.2.ebuild
index d8576bd5fdce..251299de9df0 100644
--- a/app-misc/anki/anki-2.0.2.ebuild
+++ b/app-misc/anki/anki-2.0.2.ebuild
@@ -1,10 +1,11 @@
 # 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.2.ebuild,v 1.1 2012/10/28 21:19:00 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/anki/anki-2.0.2.ebuild,v 1.2 2012/11/02 17:31:54 tomka Exp $
 
 EAPI=4
 
 PYTHON_DEPEND="2:2.6"
+PYTHON_USE_WITH="sqlite"
 
 inherit eutils python
 
diff --git a/app-misc/anki/metadata.xml b/app-misc/anki/metadata.xml
index 94827acad446..f57487b40267 100644
--- a/app-misc/anki/metadata.xml
+++ b/app-misc/anki/metadata.xml
@@ -2,13 +2,13 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-                <email>patrick@gentoo.org</email>
-                <name>Patrick Lauer</name>
-	</maintainer>
-	<maintainer>
                 <email>tomka@gentoo.org</email>
                 <name>Thomas Kahle</name>
 	</maintainer>
+	<maintainer>
+                <email>patrick@gentoo.org</email>
+                <name>Patrick Lauer</name>
+	</maintainer>
 	<longdescription lang="en">
 		Anki is a program designed to help you remember facts
 		(such as words and phrases in a foreign language) as