Bump to 2.0.4

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

3 files changed, 16 insertions, 84 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/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() {