Use the upstream versioning. Basically equal to 20080310.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64
RepoMan-Options: --force

6 files changed, 69 insertions, 81 deletions

diff --git a/app-dicts/myspell-nb/ChangeLog b/app-dicts/myspell-nb/ChangeLog
index b10c7454974c..02d6bbbbd76d 100644
--- a/app-dicts/myspell-nb/ChangeLog
+++ b/app-dicts/myspell-nb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-dicts/myspell-nb
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/myspell-nb/ChangeLog,v 1.25 2012/05/17 18:24:11 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/myspell-nb/ChangeLog,v 1.26 2012/07/23 13:39:05 scarabeus Exp $
+
+*myspell-nb-2.0.10 (23 Jul 2012)
+
+  23 Jul 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  +myspell-nb-2.0.10.ebuild, -myspell-nb-20060316.ebuild,
+  -myspell-nb-20060530.ebuild, -myspell-nb-20080310.ebuild:
+  Use the upstream versioning. Basically equal to 20080310.
 
   17 May 2012; Alexis Ballier <aballier@gentoo.org> myspell-nb-20060316.ebuild,
   myspell-nb-20060530.ebuild, myspell-nb-20080310.ebuild:
diff --git a/app-dicts/myspell-nb/Manifest b/app-dicts/myspell-nb/Manifest
index a88e3971cd9b..f2cbb2a85925 100644
--- a/app-dicts/myspell-nb/Manifest
+++ b/app-dicts/myspell-nb/Manifest
@@ -1,13 +1,24 @@
-DIST myspell-hyph_nb_NO-20060530.zip 92706 SHA256 767cd071806c1416ca19b0d89cfda541003b3413a1a713cbbf3422469133a16f SHA512 c8304b00eef33f972afe84507e79bb05b91cc339b222ba87c661dbe195c3805da36b746a6af2b73f2253c29a9ffbea2f268f1ec2c13cc97e1495578436a677aa WHIRLPOOL 0e61d44574492f128aea7b7e7beac0043d9d0707dbebb100dad5b60fe18fb96e0f88439f6e7d4304b1199be07feeae286ecf703205745bec9f6db7a6d1449636
-DIST myspell-hyph_nb_NO-20080310.zip 92709 SHA256 5c95b0173a2f3c58c4499ddd65f0d2707298ac34231748c95eb7ec109114ac3a SHA512 059644fee013ae509eef6009fbcc8b09dfc75246d2ff1e6e9e12526952c4fc7c557cd41df8e64adae0608fec4741137cd94e4d2157bab061c09c35b2c79e9d54 WHIRLPOOL 86c755bce0dac854488c3b8d5c8e8d4a15631c52ebab3f5d437d9a7409cab5e22e566bdc62ee2cfbcd288a2b2ad0cefae5016abf7b22f9f2cbd6da714b42ee8e
-DIST myspell-nb_NO-20060316.zip 570688 SHA256 30c5e9494f4e176d9d6f9c3665793d3ddac3ba9b1817ab2aa93b67c1717b3061 SHA512 579e5320721a7999fdc81c2b0bd33995ae8d460f53aad914729142f7e1daf43bfb74fa398a3d4b34807a668e665269466e032c060cf341c5838fe215de929939 WHIRLPOOL 7ebc71138abf53ff945830bf84094bcfcb6086938c204d9267c4ff47697f8084fda17bc3d681840e5fd047c25f0efdef1d19c11a3654ac6caa87dc9f4e38dbd1
-DIST myspell-nb_NO-20060530.zip 629699 SHA256 a0e9b84c95eec7b9deb6cab822b2da92f89be728f5ac308d3a975124251983c0 SHA512 88122b9aa1a96233be10d0040a0d6dc14cd93f187280e807cc9ce36d53d7ba9219557ebf608b56c1bf5e469644aa9ed07805915deb2678016b09cd5602de5210 WHIRLPOOL f368f2478a5440e151f9b6d30a90c3a1ba58dfc8c28dba2487471a413e0f0f5cca52ce5dc14326ac0fcbadba84e593c80c6d94cd5af3f4686d5826b56a9df953
-DIST myspell-nb_NO-20080310.zip 1332893 SHA256 38b0aa6a66de2256c6e4e75aada9a4259eab7c48bd7e5213ec34d983d5a94be2 SHA512 2f0636a66265e2d46c92ee92ecee39749bfcc5ccc4d44fd1a85fec54ad5df1309e410238bf825b3415ae860e6eb498c091b4c2bc6a4f1d5357613670011f9907 WHIRLPOOL f9f39b2a07c3f75aec721083b8cfedcd45ddfffed9afb6ae9c8b6fb3596834b0fff3d5e8b6073c1ad41f27d2b572b39d5651d7414449bdfde0846100ebe10d80
-DIST myspell-th_nb_NO_v1-20060530.zip 40481 SHA256 a994b4a914bf82ef4dedfef90dd1b9adf3d4e565ed43645f5e6a76aca0199b35 SHA512 9ce05a7feba7c34f8c49f71a43bf4148fa520b1142877e58374fa0e51bee53c50c08465ee7ff46476d2e961de6befa5bfc75094126ebc8c15c83c69906d1b5cc WHIRLPOOL ac8c289aa399ebd3c82a239b86328cec0a3d19905143ae6c6b44349f323b7d3e4652685355ac2f6eb591a5e595a8e39358cbe203c341954a2e4ad9069a0136b0
-DIST myspell-th_nb_NO_v2-20060530.zip 69047 SHA256 95c2110f1e539d4367b767e02551f8a08aaf1cd1e21fff1b04900a6515c57ac0 SHA512 14ba9ee6e1e37353fa982ce65ce80db5bcbf56d529f466023cb7f9cb7f243e7c2c1f968bed5f637446409abd1bd4474721187e7dcb5d9770df388aa3f6ad0ed5 WHIRLPOOL ddbd09c8dea3bde974530bfbe66ebede53dd3a0916d9d5cd5206617e5ca4def22a5cfa08417d7d4064d5b52a0858b206460f498d75451b599340363b6aa8eea2
-DIST myspell-th_nb_NO_v2-20080310.zip 845495 SHA256 7152112c2d4bd3dd053bda980347e5484e5a9e8f77958a133d0234bd8f053ce3 SHA512 57ecaf1eb0d5a58456b7ea7a915db68ae271dcbe9eef635347e95a23146f6529ac1a38a4b1eeac2dea9b7ada4cf50cf2808fe9e162d7afbaf2fd8a41c258cfd2 WHIRLPOOL 0ee7cf351109c235fd796181b5545c019e4b5c2aa347a6c07243e0ff19900b59dbf8a045f593207189b4f564070b44f0764fac5c1a256b6cb86a2a6b0a86cd80
-EBUILD myspell-nb-20060316.ebuild 647 SHA256 a7271c7d2eab005b60dd49d2d72066b75af9e90e532210bd8b7ddb86593c842c SHA512 9ee83e1e900f2e5c52c060e42b2a5867b503925bd30230a187826e3b01ebca5a876cc9d2248884211b13883311eae669e424c35bb7f3d807fea05f5812cd6315 WHIRLPOOL 7bd2c900e305c260c5c636e80f60d6b07cbfe5d01e65cd8c41966e9dc2b1158283f375820aedc97a6a2b038112db20020ca09d687e44b9307cde21fc6ab409d6
-EBUILD myspell-nb-20060530.ebuild 811 SHA256 380e7925642f813b79eb7c5e83e529750a74e5660f218f74490ede633dc85ad1 SHA512 f10954c105f0231ed325ccb39b0f8464af7b3ed87b06c6b046ec34228a4aa19d458806b3c4a1cad67fb6dda4b564a0dd9500ba36956dfb797889cb3f3231ceb4 WHIRLPOOL 57ba79b43efc09d887663681f578b2e177fc6625c865d21591423c8cc01c38b201733bbcce14e0b90d41a6f0cceaf2e2e3e8adb7722d1079d43d29075ffa511e
-EBUILD myspell-nb-20080310.ebuild 750 SHA256 bae2ec86db62c7c5be59e0d405cebb1d573452721f077423dde63f4188cc4521 SHA512 9b772cc4bfb20ca0dbfef41a4f8398aac5575ff9b9757b0565897f7470400630cd58dfe43375b1d7b81b1fb97bb7a96cf832b6a1ee4525f176ec58341f8b796f WHIRLPOOL 6c62efb09f90742459df4b520401131c25ab9aa3651e4b91605d43e8f81838df06135d285a3338e1a0b4de98d6429b22ba778f2d6b8d5e7ad7e34c3b51875390
-MISC ChangeLog 3379 SHA256 8317e779bb7d1e8322fb3151e9186bb7441146a2ed97c7b9409c4146f1c6cfa3 SHA512 2a78809599e80acb1120ac95be7f32d782eaa813932ea6c11b3b9bb5bae7cab3ec94726b93eebaf0d9a5405b5e83b23739a3825d9623a249b81c0dbe21628c07 WHIRLPOOL c1b0fb6d832f133187ed0839a16b22ae3334a608952013a33b7fb83e1b30add1b5c63e4dcf188c1dd2c8fba522dde22ffcd72d7fb8677e529fe36d7834721979
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST no_NO-pack2-2.0.10.zip 3221701 SHA256 91507d5cfc7b33cd52e2b0628af28235797ca8cd01acdb1a9d60b8f917ff9817 SHA512 af7ee5c465035aa419c60ef8621d6697e86e5fbed39737e86565bb3fe4851ee35d57f832e56ef0d27ce9b26682d5b32ef2213dd6c3323074cde2784fb236298c WHIRLPOOL d6e3e18ae7f09c038831ff7c2d5e8facaab6a2e87e5b167d7f492919016f7b0b921aadd7c366f47930a254eacca6c08cc6af5af0a1de02155760ca50c3e50617
+EBUILD myspell-nb-2.0.10.ebuild 797 SHA256 8b231c795ca614b8c8527c03689b0b68fc071cc4d3cafce01ee2530b069acbf3 SHA512 7fc0cab2b903af7f4f760f03fda73cb11da4f81220532a9bdc5cc67614ea523b5ce7c1cd7259249a3f029caab038511ba83be2f75b4d45517adc0b866eb63afd WHIRLPOOL 1e0896ef940a70ee33f1c9d4dba275500bd245dcb50af4b718b20e9505c48c1c9358f0c7dec674119a468996b95745df2c4676e0fe8613a946ce5fba3774e42d
+MISC ChangeLog 3648 SHA256 bb01c87fef8a04893ea14a272b3389c9f2edb1ee358a716800d13611256339f4 SHA512 24d6db98ae012f691e97005c3fdb001f5b728a2755431b8792e70428fca267205e1bd1d2249ba0c105c747e8595c4884630858f2e3d6a35a24da9d492d9f107e WHIRLPOOL ccf392efbebe3743d7e5a3e62a6852c86d26066be40366fb958c29f276f5f233ebd35e339dbed0699a6be6a2329e73b0cf2e5183180ad7647cf099a556ae26df
 MISC metadata.xml 163 SHA256 2a83bf864655c5acb5d551aeb9b060d57545fb7cf1dd9d7fcdc16fbca221cabb SHA512 d8edefa125f81b05e1a1cc9917a2ff6c1618970f9b26b02fe37dbb7b82c466e50168f690c2f629103b199989b4f79d9e10a1af410530e9ca23dada148db91a12 WHIRLPOOL b02df903aeb78e797fd5cb86d14cc93bff3495ec7ca20aab8bca9e5d6f2b545d31972cb7f1b831c5215ee9ea75bf89df20e3c1a80b47ef9cdf1ef47271e9d2bd
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQDVQCAAoJEOSiRoyO7jvoFD4P/R/lUnSXiZUACW6X3EBbnDXd
+y6eJ0KwGlCN2gqBzj6Zk2y6tbNrxJfcNB9ETyVB06pFwMCaqIrDjBNlGWiiWc53s
+x5pNUBHv0m6HZo371O8ET2LVBTnyFXAXu8EbXMmFbVFueUReKpS1/44slZQueeiH
+M9BzExYpWdSlB+MTQwAUG6FAaLgFx2L/kp94XK4CFJ1U7N+EVGwGiIqRHIHQpyYT
+hGiiJTG3xThWsc38h/9+0fBYweWI4CmuQNZvllPowyQYghIrZEsJ9oIlhUr3mejF
+9v/i5HU+LToUlQmLztM+f0NsW65KH6MIR745o38UbbA4/+AWYMeVe943OPGGjVBC
+UH4KuON5k/VftToKbgY++YGoCmpKuPP/LzBqm1i/QVuZlVbsmDu3v+cjcaCMp9iA
+6f3yW3avF40J32SUVBjHDRbaTuDsoLyr5DAV6vvlE67DJk2T00HEaCmqWTud46US
+WdQh1lgvnFOsEeLdEf1MQZxdGdQu2FabIMLzHdx0BleOblXz255Sbmo1wV3kNaox
+P9/QBs5WGm9Awb9BVc1hI1cdphUtMdaMWc2AhQuReHxsgPogAdyxdvrR+BvUXaOu
+bYhuN4c0x3/7vAQsfYg/byonTXSy+28m4E5uiym6/C9zZvHSQp9BsnWTUiDAxRv1
+H5wlwhv9PVPVM3X0yrIl
+=VMe6
+-----END PGP SIGNATURE-----
diff --git a/app-dicts/myspell-nb/myspell-nb-2.0.10.ebuild b/app-dicts/myspell-nb/myspell-nb-2.0.10.ebuild
new file mode 100644
index 000000000000..4635a61b44ca
--- /dev/null
+++ b/app-dicts/myspell-nb/myspell-nb-2.0.10.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/myspell-nb/myspell-nb-2.0.10.ebuild,v 1.1 2012/07/23 13:39:05 scarabeus Exp $
+
+EAPI=4
+
+MYSPELL_DICT=(
+	"nb_NO.aff"
+	"nb_NO.dic"
+)
+
+MYSPELL_HYPH=(
+	"hyph_nb_NO.dic"
+)
+
+MYSPELL_THES=(
+	"th_nb_NO_v2.dat"
+	"th_nb_NO_v2.idx"
+)
+
+inherit myspell-r2
+
+DESCRIPTION="Norwegian dictionaries for myspell/hunspell"
+HOMEPAGE="http://spell-norwegian.alioth.debian.org/"
+SRC_URI="https://alioth.debian.org/frs/download.php/2357/no_NO-pack2-${PV}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+src_unpack() {
+	myspell-r2_src_unpack
+
+	for i in *.zip; do
+		unzip ${i} || die
+	done
+}
diff --git a/app-dicts/myspell-nb/myspell-nb-20060316.ebuild b/app-dicts/myspell-nb/myspell-nb-20060316.ebuild
deleted file mode 100644
index fe4bb6244191..000000000000
--- a/app-dicts/myspell-nb/myspell-nb-20060316.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/myspell-nb/myspell-nb-20060316.ebuild,v 1.12 2012/05/17 18:24:11 aballier Exp $
-
-MYSPELL_SPELLING_DICTIONARIES=(
-"nb,NO,nb_NO,Norwegian Bokmaal (Norway),nb_NO.zip"
-)
-
-MYSPELL_HYPHENATION_DICTIONARIES=(
-)
-
-MYSPELL_THESAURUS_DICTIONARIES=(
-)
-
-inherit myspell
-
-DESCRIPTION="Norwegian dictionaries for myspell/hunspell"
-LICENSE="GPL-2"
-HOMEPAGE="http://lingucomponent.openoffice.org/ http://folk.uio.no/runekl/dictionary.html"
-
-KEYWORDS="alpha amd64 arm ia64 ppc sh sparc x86 ~amd64-fbsd ~x86-fbsd"
diff --git a/app-dicts/myspell-nb/myspell-nb-20060530.ebuild b/app-dicts/myspell-nb/myspell-nb-20060530.ebuild
deleted file mode 100644
index 60bfd14d815a..000000000000
--- a/app-dicts/myspell-nb/myspell-nb-20060530.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/myspell-nb/myspell-nb-20060530.ebuild,v 1.6 2012/05/17 18:24:11 aballier Exp $
-
-MYSPELL_SPELLING_DICTIONARIES=(
-"nb,NO,nb_NO,Norwegian bokmål (Norway),nb_NO.zip"
-)
-
-MYSPELL_HYPHENATION_DICTIONARIES=(
-"nb,NO,hyph_nb_NO,Norwegian bokmål (Norway),hyph_nb_NO.zip"
-)
-
-MYSPELL_THESAURUS_DICTIONARIES=(
-"nb,NO,th_nb_NO_v1,Norwegian bokmål (Norway),th_nb_NO_v1.zip"
-"nb,NO,th_nb_NO_v2,Norwegian bokmål (Norway),th_nb_NO_v2.zip"
-)
-
-inherit myspell
-
-DESCRIPTION="Norwegian dictionaries for myspell/hunspell"
-LICENSE="GPL-2"
-HOMEPAGE="http://spell-norwegian.alioth.debian.org/"
-
-KEYWORDS="alpha ~amd64 arm ~hppa ia64 ~ppc ~ppc64 sh sparc ~x86 ~amd64-fbsd ~x86-fbsd"
diff --git a/app-dicts/myspell-nb/myspell-nb-20080310.ebuild b/app-dicts/myspell-nb/myspell-nb-20080310.ebuild
deleted file mode 100644
index ab838f0724a8..000000000000
--- a/app-dicts/myspell-nb/myspell-nb-20080310.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/myspell-nb/myspell-nb-20080310.ebuild,v 1.10 2012/05/17 18:24:11 aballier Exp $
-
-MYSPELL_SPELLING_DICTIONARIES=(
-"nb,NO,nb_NO,Norwegian bokmål (Norway),nb_NO.zip"
-)
-
-MYSPELL_HYPHENATION_DICTIONARIES=(
-"nb,NO,hyph_nb_NO,Norwegian bokmål (Norway),hyph_nb_NO.zip"
-)
-
-MYSPELL_THESAURUS_DICTIONARIES=(
-"nb,NO,th_nb_NO_v2,Norwegian bokmål (Norway),th_nb_NO_v2.zip"
-)
-
-inherit myspell
-
-DESCRIPTION="Norwegian dictionaries for myspell/hunspell"
-LICENSE="GPL-2"
-HOMEPAGE="http://spell-norwegian.alioth.debian.org/"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"