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

(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 0x89DEB219565C32BC)

5 files changed, 11 insertions, 156 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/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