Rename thes and hyph files to match with others (not that it matters anyway but looks nicer).

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

3 files changed, 33 insertions, 20 deletions

diff --git a/app-dicts/myspell-fr/ChangeLog b/app-dicts/myspell-fr/ChangeLog
index c104a241d03c..7c94f6b31e18 100644
--- a/app-dicts/myspell-fr/ChangeLog
+++ b/app-dicts/myspell-fr/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-dicts/myspell-fr
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/myspell-fr/ChangeLog,v 1.22 2012/06/13 12:47:39 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/myspell-fr/ChangeLog,v 1.23 2012/06/13 13:03:38 scarabeus Exp $
+
+  13 Jun 2012; Tomáš Chvátal <scarabeus@gentoo.org> myspell-fr-20060316.ebuild,
+  myspell-fr-4.5.ebuild:
+  Rename thes and hyph files to match with others (not that it matters anyway
+  but looks nicer).
 
 *myspell-fr-4.5 (13 Jun 2012)
 
diff --git a/app-dicts/myspell-fr/Manifest b/app-dicts/myspell-fr/Manifest
index 05b11b44e14b..8bbc5cc4d1d0 100644
--- a/app-dicts/myspell-fr/Manifest
+++ b/app-dicts/myspell-fr/Manifest
@@ -9,23 +9,23 @@ DIST ooo-dictionnaire-fr-classique-v4.5.oxt 2251909 RMD160 b24352b2b65a5e00381cb
 DIST ooo-dictionnaire-fr-moderne-v4.5.oxt 2248032 RMD160 bb74f4cb04cdd10cf9fa02eb434f9ee6934c8696 SHA1 6bcfea38f0193fab83a570d4c52d95901ca177c8 SHA256 3899b56b880cea89031d3e2f230d73945ecf6379d2f82e26e9a6b3faf7f5b9c6
 DIST ooo-dictionnaire-fr-reforme1990-v4.5.oxt 2255388 RMD160 3b42ba77b568d3b66b55e592aff2b54a5f47db72 SHA1 472795b7398a8482bee77efb5f78c24863919ce0 SHA256 1efd97af6a301903969334a36a837e0f1c4406098ca06050fbd1686e7224ebbd
 EBUILD myspell-fr-20060316.ebuild 1459 RMD160 d1a46aa5bac4c0c4fe97fb0b0b0b7e8083725a51 SHA1 3cd39446cf7204bd6ccf39c23b23e4864641d46a SHA256 853821adc483de577b6ca2ae5594225b758cf78bc15fd8c43fc65b5941687229
-EBUILD myspell-fr-4.5.ebuild 1398 RMD160 072e0902a5be8fffde3044a75362fdbf2990313c SHA1 8dd2476cab5228ab3782b3b0c2b327ed8857b9f4 SHA256 d23a1f9681a68ba9bf596d2ae9858b0feabd5ae1cbf3dda1a3d27546a63099f6
-MISC ChangeLog 2873 RMD160 cbcab751002a6ab07893a448dbe11a883c749154 SHA1 7d8a91fc9e9b15cd76e6a13bb0794329ed788572 SHA256 52589fc2eebf17847b87e6f40f847469990bdcf2c064f8a8d19b1c254a0ccaab
+EBUILD myspell-fr-4.5.ebuild 1635 RMD160 a49f8c020927b1381cd8501c2a4acc438a0dd366 SHA1 98bc1304f24a9851ec567f9c44241c84e50f503b SHA256 64c749a4f4295653d342320e4db907957d1469c450d08524bc100280154988a1
+MISC ChangeLog 3080 RMD160 d58fd1dd9f942baa0d55af4f359ac03a51cccd71 SHA1 653c2cea8dddf2ac7b1f0827942578962c5d4901 SHA256 78ec422c78eb4bf33eb02dce1ade69d512141bb10d0e66a0180d0ad695092969
 MISC metadata.xml 163 RMD160 444608d5dce1eb9307c253140c5f6b011fcbece8 SHA1 87029f6d4a8e381a59cad5f8553f0e5163b11a7e SHA256 2a83bf864655c5acb5d551aeb9b060d57545fb7cf1dd9d7fcdc16fbca221cabb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJP2IvyAAoJEOSiRoyO7jvolMIP/326z3gBlMhZENm/0EeVwLNh
-BQ6EiuCME3BT4L8R57u2jDCkeealD8erj6IQc5bhtkZhmzzcYoS92hqkFkIIVdky
-q5QKDKewkY3I0UiRbxzDJuMigQ3wXhYIbTl304f/8Gzg1teerN+C4aKWxx2Zs40A
-gOryd5PzKIBJzDSzcodkDziT/W7SvGQJgJNr92GoEFrDaxRszzavBH5XTXTzTZKH
-S6MuMCJGvZMtkZNYZQPTFz8LanZBm6eZruHTSYhxXeQWvM6++JKd84Iek7kHKD1O
-7AZV+1dDbSi9atpah3Mj3Do3qJh7FY7G60HNXglKv9L1EAaAjmLuPf12V7KeoetG
-tarTvqK5ORcLcrIOzud8jjLrOZfB5TgDE/vN3znwyYOkedbrQdnI88oEx7PzhqNO
-7CS9yJSwJsJz9RkpqEBxlP3Z6CAFcEW9rSr/nBumZTXIFBpeOAB0PyKzC7/8rzem
-EUYylWdJhLpTpqiBXsomjX0r2nW7aNKjauAWo20EwLuBf0PazvBXLU0867NwsDCo
-l24chlRLho+PMu0DDkE4tC9ebZ4tY4PDcuKglCQqDxf4JrHrdW7SekNO9BrYn3Rk
-zaiztg9yN3MsuWG/NTCFLlftj38RA/z6QWp/tA0mYtPzJ4Rq6qHrTPwabe8JyPCV
-CoSs+VDBYN6ORz17hC8K
-=yWP4
+iQIcBAEBAgAGBQJP2I/zAAoJEOSiRoyO7jvo1rYP/2FH6ueMNFGmXwui+vcaMAHN
+iFAU9XEyHzJmGWT4J0H/zVPIfSu8J66LDzbirrZRPT+oAT8Z3siYHRsxK1+JnA0a
+AAPvUlMa8gpfZ8RFk3N3ny2nNwGDKJJNjRMf42oQ1hSlQcJqB9GJ9TdXKuvtR+l2
+hBTK1PxqTC86+hdYSFXJVP6CKG+jhnmAd3iqQ8xCQXMeps/+67ZUWkr9Cm9zXDYe
+FXJhy6UxnBi/9HNO46uxeTk93nC+aDKIr8xrVTm32f/XiymA4Cqck5tif69O21VP
+4Wl1Z0vgmMJUFtfDySItjONv3J3KcnsshbyI25uaHsHg8QEVG7I3OkBA99hEOCK3
+qQ+bqPj4FWhIASgWvXxUTmdssPocNNVd+ti0VECnE9MiD2BBrf+yTDemgaTlXiH1
+cCVIDOP0j+wvnljganL4vHZiz5Ci0SNMkxIQ78slkCIzwiW3G7MEP+nVLZjRky+I
+gjHhO8AKCurLfY/xFuCfeJktd5nRiFTW/SrwwLrkZZnS2xu5MK4NZvY8iryVU01i
+rajEtQDvm8VkWQ84PFiwijZeiMxJHzfR80Wyt7NRyxgGzmhuOD1S9itPSKPBGzi9
+eKcej8yxasmTfrDXbIfUFO2fxamTf5z3Imdb5yHyFa5euzDu99p6gBTeFeSaWVGC
+pEjKQEgQNETDiBLP8XSF
+=b9V2
 -----END PGP SIGNATURE-----
diff --git a/app-dicts/myspell-fr/myspell-fr-4.5.ebuild b/app-dicts/myspell-fr/myspell-fr-4.5.ebuild
index d91fd9369c39..9898d0bb33d1 100644
--- a/app-dicts/myspell-fr/myspell-fr-4.5.ebuild
+++ b/app-dicts/myspell-fr/myspell-fr-4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/myspell-fr/myspell-fr-4.5.ebuild,v 1.1 2012/06/13 12:47:39 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/myspell-fr/myspell-fr-4.5.ebuild,v 1.2 2012/06/13 13:03:38 scarabeus Exp $
 
 EAPI=4
 
@@ -16,12 +16,12 @@ MYSPELL_DICT=(
 )
 
 MYSPELL_HYPH=(
-	"hyph_fr.dic"
+	"hyph_fr_FR_v3.dic"
 )
 
 MYSPELL_THES=(
-	"thes_fr.dat"
-	"thes_fr.idx"
+	"th_fr_FR_v3.dat"
+	"th_fr_FR_v3.idx"
 )
 
 inherit myspell-r2
@@ -39,3 +39,11 @@ LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux ~x86-macos"
 IUSE=""
+
+src_prepare() {
+	# move the hyphen/thes to common used name
+	# versions determined from README files
+	mv hyph_fr.dic hyph_fr_FR_v3.dic || die
+	mv thes_fr.dat th_fr_FR_v3.dat || die
+	mv thes_fr.idx th_fr_FR_v3.idx || die
+}