Remove old, install localizations properly (bug #535760)

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x565C32BC

4 files changed, 22 insertions, 33 deletions

diff --git a/app-misc/anki/ChangeLog b/app-misc/anki/ChangeLog
index 2f4dd8116309..77d81c2fc1fa 100644
--- a/app-misc/anki/ChangeLog
+++ b/app-misc/anki/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/anki
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/anki/ChangeLog,v 1.88 2014/11/25 08:45:45 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/anki/ChangeLog,v 1.89 2015/01/07 14:31:30 tomka Exp $
+
+*anki-2.0.31-r1 (07 Jan 2015)
+
+  07 Jan 2015; Thomas Kahle <tomka@gentoo.org> +anki-2.0.31-r1.ebuild,
+  -anki-2.0.28.ebuild, anki-2.0.31.ebuild:
+  Remove old, install localizations properly (bug #535760)
 
   25 Nov 2014; Agostino Sarubbo <ago@gentoo.org> anki-2.0.31.ebuild:
   Stable for x86, wrt bug #528656
diff --git a/app-misc/anki/Manifest b/app-misc/anki/Manifest
index 88d003113a95..31a2e453a57a 100644
--- a/app-misc/anki/Manifest
+++ b/app-misc/anki/Manifest
@@ -1,26 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST anki-2.0.28.tgz 3314001 SHA256 ba803dfff4f03ab6aa90b722413338de9165d5530012caa640c90fc1681d4336 SHA512 8ee738f724e47a21beba759d4a995e9f014ca2d1f0911a85d8338468f4e369928d1ac3b5bcc2607cb26c7e47e3924d8e9f73383bd4aaa2955bef15272da8deea WHIRLPOOL 57bb05f64844b194e55667708ccfe23b8a6ad0471dad998df8d751b10e81ce3297b2f4d146319883b5f6d668ba79bccd328c9e80dc31c64a1296d49d509cfe14
 DIST anki-2.0.31.tgz 3329290 SHA256 4b969629255b00db9a9eb8a2fd70271cc41c92c47752eb1c78e8609ff025be2f SHA512 3e6e29247d83b026ece6974007c848822360a812838dbb718cf3f1423fc9d015236b027944cd99f3b419e0fe4fe6cb2390d185f00646af727ec8e76f4aa3cbb8 WHIRLPOOL 42b1ecf2cc856c15ad1fe690d45e8051a8b79ef0b850e701a6a8a510a56cc4e6711bf4c8acc8ae9add7a3c761788005979c9a6398a71e1b28c9821043d5f6053
-EBUILD anki-2.0.28.ebuild 1624 SHA256 c7d95aacbf572517cda4c847d3454148cee5a89e5811d1792c87a9bb46260e29 SHA512 0b3f48862ec76a52b91796ec635fbc6da2643c50c5601b7695344245fdb842fdce785ca954e9f6c922d18ffae1b1d18d82e6d2ebc2e28212bedd020e69c97ef8 WHIRLPOOL f9d595f9bc9cf303cfcd4153c5b26e401f70a682222f12739c40a7736a5967dd70fe05b9981ddc736e879912eeece8ed0a1e92c17a5a6e735f7c5992d2aac87a
-EBUILD anki-2.0.31.ebuild 1624 SHA256 97046177553453537567bd7c2eab40e2924090948430d3aa87bb1388e3b6f935 SHA512 f674f3520b12279a2e2022d9c3996cc7dcab8535643d87b8eb235078023dad9f89a5d27b52ad42f44a2536649c92b07cf62e388ba8816eed61b646946a430cca WHIRLPOOL 4485fe3cabe1d81f13ae8f38015d98196445d56cad4b178d09463889fcfb628ea2bf1cd25cb24a5e5f0e73328be28b1ebfd2b9c244da5ca3b6aab69ec55aed67
-MISC ChangeLog 13130 SHA256 1a59483bf7299c4bdce80c25689b1f0fe8827f3649bf8e6d3de314a547ad006e SHA512 3da980649149b92b60b19c0e35cf2089592de07e1a03d957c4fec0a11fbc8bf63a4cc299a95c560b29efac20ddb74854d51efeb9f402a06ab908a55485371b21 WHIRLPOOL ce7033a96678b1c37f93a47a3798733c5849fa1e2c364ae4ff97fbdfcb44fa8ffde55e0822639c1a165a4873d3760488612d859856bfb58421c986f53ef36d9b
+EBUILD anki-2.0.31-r1.ebuild 1377 SHA256 415d06410739623e1d3373761cfe5a27904f5da29d0bf20a35f80bb349efeffd SHA512 aa5b4336767a546e4a9cd6e07c7ca095fe5ee9a32a2dadd52060142e3914aa85e5095c38e786d257bbf8d8e7c99e4bd4980730a8061df47a8d49872ca2c7e93f WHIRLPOOL 0e34d5e7ec88a35608263d77a683bdc2ef54dea25a8a9c515fe2d2e9cdb85de3f5cd312d4a9b5606bfc53d6006f1ab072032170e1256afc667689f5771b01cab
+EBUILD anki-2.0.31.ebuild 1626 SHA256 9585907d2ffbc41afc36423d4d7d16ddbb32741a521290a43fb7e422d8b4301f SHA512 f52a35412974f97ee254251a4b737466c886e303e5f6fe81839da49d46e4cc530bf5f8786a5a3e11073f7585f8569c03cd5b9436a3400f55e8108ac15d9344fb WHIRLPOOL a561f252bb927e5f8a21b7e280638f7aea96afe99411f11d3944132fa5d6a126946d11e0f0d8af1a1e95ac363078e296c832c598da3dc16eef7dcb041fd1dce9
+MISC ChangeLog 13337 SHA256 344aea79f53da791868b858a9d86d5af157f1d24308b1a37b89efe396abdcce7 SHA512 a92ae6e0f74558e88cf8c68cff1ba01063f462ccd058aed49db4765627333eec2460e63047ace851868a0d52f39e6348c96a23e6a1d0522d5a536c3eda003bff WHIRLPOOL 8cbd0d6ba236a5bb978c9f44f37f14f91ebfd133f67cd0b0b39f107d86b6fc69fe0b5ec054c9bdd97cda0b2578f9ccb4e604f34ebd957d34907dc4cdf8334c20
 MISC metadata.xml 752 SHA256 24ab3347c88cbfc3277da0fee9bab86a68d86565bbc0e1a9168998f54eb7a021 SHA512 4c0492455131a4ab214c68cbed806102de4df1894380cf8a4ad1f0c4a593b2738d50a4bf6e6dde15dbfa914b0075a636469d366f3e7cceaf7c8098369cff6c37 WHIRLPOOL 3062f8b144f7102ae7bc6516b8ee8d5820430535420967c6d9093a94e9ad4dc26cc500f3e6cd4207f0555529f7d748a0086d8149aa48bdc4fe39c4c97c69d813
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUdEG6AAoJELp701BxlEWf0Z8QAKFe5sQbsGJGEkX5cHxlvA0/
-rufuP05S4jvLmt+LMf6ZNvGaBOhtlyn7hIdeLgJpCY/6nKD7g+NEIRXGuaAEimKi
-JaBwG59arWDoVwQiwlUpAMYGjenp0S+dR9kwHjMLQ6gxa61xp014ilAeu4Fo2xfM
-ODCqJlsMxhKWT4ja7iSbmgLxaDzZ8V09tJ7H2+PyNMEeUMOFV2fo4MKWBvC7sngD
-rz6KzK2/Q3+bSDRthk8yn7yekxx2mGPbnmvPYq9JX7W7TKFTWTeB6xh7Ip39aUh/
-RCWQ787HrQUnNEsfMq2B1o3d3Ms7o+v/zS/KfqSmYCoXdtm1Y6gunPSU8hlGOLHd
-ehHmePCrZHJdlR23VHXOAL/v1thu+Noco0ZIj6xaSkdkeTDXdJxwmu6ikEOvYeQT
-B62kv/2fMWDHO/7Jzt26x1npMxmJpckJj+VyYbyXZ0ho1mwGD/xaFd8rNq1UlRni
-b3wz740Yd41rBeGyZaNQ5x05PHDAswubF8kptv63Zz/3zr3o+uqrAmiClRDUCasP
-pnWXd867WfDl3v6/K1JqgK1pLQpaOlfn2NursO7KPE439aju+GFXnnVTMXojGb9A
-f3tFAHS6AS7qcwoC90OuMdoX5VoCWEzUEElkpGgmrTLx8QLrJDEQkXxXS64iYt6M
-FacQ5n2kX+IzeqeHTV5S
-=kuKG
+iF4EAREIAAYFAlStQ90ACgkQid6yGVZcMrwrBAD+JL76YcPNXILfld598ha7bFSz
+xycjHtCzJZCE3Cr11B4A/2Yvzimqrhj46qMklIABHg8tjP5dGbfgUs4CXhlJ+j8K
+=gTxk
 -----END PGP SIGNATURE-----
diff --git a/app-misc/anki/anki-2.0.28.ebuild b/app-misc/anki/anki-2.0.31-r1.ebuild
index 3482fe71df98..8d0ca70b0350 100644
--- a/app-misc/anki/anki-2.0.28.ebuild
+++ b/app-misc/anki/anki-2.0.31-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/anki/anki-2.0.28.ebuild,v 1.3 2014/10/09 15:19:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/anki/anki-2.0.31-r1.ebuild,v 1.1 2015/01/07 14:31:30 tomka Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="http://ankisrs.net/download/mirror/${P}.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="latex +recording +sound"
 
 RDEPEND="${PYTHON_DEPS}
@@ -57,14 +57,8 @@ src_install() {
 	dodoc README README.development
 	python_domodule aqt anki
 	python_doscript anki/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"
-	fi
+	# Localization files go into the anki directory:
+	python_moduleinto anki
+	python_domodule locale
 }
diff --git a/app-misc/anki/anki-2.0.31.ebuild b/app-misc/anki/anki-2.0.31.ebuild
index abb49da3bd8b..e154a89d6b3e 100644
--- a/app-misc/anki/anki-2.0.31.ebuild
+++ b/app-misc/anki/anki-2.0.31.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/anki/anki-2.0.31.ebuild,v 1.3 2014/11/25 08:45:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/anki/anki-2.0.31.ebuild,v 1.4 2015/01/07 14:31:30 tomka Exp $
 
 EAPI=5