diff options
| author |   Ben de Groot <yngwin@gentoo.org> | 2013-08-21 12:03:18 +0000 |
|---|---|---|
| committer | Ben de Groot <yngwin@gentoo.org> | 2013-08-21 12:03:18 +0000 |
| commit | 45f65942e21b737fc4e06ac1c1af9be038568ec3 (patch) | |
| tree | be3d21fa425418b47f4322c829c83c5b66813981 /media-fonts | |
| parent | amd64/x86 stable wrt bug #472428 (diff) | |
| download | historical-45f65942e21b737fc4e06ac1c1af9be038568ec3.tar.gz historical-45f65942e21b737fc4e06ac1c1af9be038568ec3.tar.bz2 historical-45f65942e21b737fc4e06ac1c1af9be038568ec3.zip | |
Fix multimple values in test, bug #471083
Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B2474AD43CE296E!
Diffstat (limited to 'media-fonts')
| -rw-r--r-- | media-fonts/droid/ChangeLog | 7 | ||||
| -rw-r--r-- | media-fonts/droid/Manifest | 24 | ||||
| -rw-r--r-- | media-fonts/droid/files/59-google-droid-sans.conf | 18 |
3 files changed, 40 insertions, 9 deletions
diff --git a/media-fonts/droid/ChangeLog b/media-fonts/droid/ChangeLog index 1d0dfade9761..1d1240016734 100644 --- a/media-fonts/droid/ChangeLog +++ b/media-fonts/droid/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-fonts/droid -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-fonts/droid/ChangeLog,v 1.23 2012/10/07 10:28:30 pacho Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-fonts/droid/ChangeLog,v 1.24 2013/08/21 12:03:09 yngwin Exp $ + + 21 Aug 2013; Ben de Groot <yngwin@gentoo.org> files/59-google-droid-sans.conf: + Fix multimple values in test, bug #471083 07 Oct 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml: Drop maintainer due retirement, #274113 diff --git a/media-fonts/droid/Manifest b/media-fonts/droid/Manifest index ee28795a91f6..dd0f8cf68d57 100644 --- a/media-fonts/droid/Manifest +++ b/media-fonts/droid/Manifest @@ -2,18 +2,30 @@ Hash: SHA256 AUX 59-google-droid-sans-mono.conf 345 SHA256 42da7d1ac6d7055971c8b1bb98a83e893fbed621534b04247a5f6ed89ca14d44 SHA512 f90b13c2779b755b5c35b2c1b3b5578c846a6acf47d049169df866625e478e940662398b8b95589bacfb54cdefa1de67c8bc2220607e4041f2b515996f2d1ba1 WHIRLPOOL 728322b348d64c025734a0b51a09f5862c1ec4150616e17ff1e93cda685d3598849229e62e6e77fc54818a9e52616c0d6dedad975383a63f2012de39390406e8 -AUX 59-google-droid-sans.conf 3452 SHA256 17a857c9feabdcab4b4f316102bfb6a965d189f2e2e83b79401862eb05c92916 SHA512 f2383326f88283beffcf91e304991b70b8d573a89cb72a44c452c804a801139527742df83c6d1a81c5c325fa7320535efcc1ed212ce433f9711c58f0f01746cf WHIRLPOOL 5da5d152bbd3185609571b9c89afd7db401a9183d89c512f1458b70f11abfccfcc6ffb683c67b64a5845b43b511480e4d294a003d3069f1758f9bbfe08dd7132 +AUX 59-google-droid-sans.conf 3885 SHA256 651bfa2c776011bedca855229d08f90662ba5c9a151458d366c3c07ea15f187f SHA512 00c1f8e022ce9e7e8a74c20ff74129eafb99ab3c712caf921d5c2298a6be4af61d81a7b8bb42783db9e1188cf785a705438e0acfdb202b8bde551aa62249a191 WHIRLPOOL 13835c8b2ad8e22c69bcca2ffd77810170a3c7f6798c8f111e2a8b4a31dbb8e11a28402910179566c6d57d23a422887b262f5f856a2a608fe10559d642cae4a4 AUX 59-google-droid-serif.conf 329 SHA256 1ca686f607be4f4d62e8232ac194875a817df58741a18db02017f803028e88c4 SHA512 2990e30ffdcb32feac936e8d6d0cb6ed6c2071b551b9812c7f4f514684f8823bef4273a76c781001f970812c4056b16eb639446fa6a4027cd3a36f017a1eec48 WHIRLPOOL 0477b92ad5a3e35b3c10ac948173de8de32ec1aeb3139491fd4982426476e1e9455395bb2789726ee31b718f3db699b5992e919f1f4065208416cd7df098bdad DIST DroidSansMonoDotted-112_p1.ttf.bz2 74649 SHA256 78e4d9a5adb9cf525ed9e76f9691df8506242710a13d21bf2538a96b781a7ffa SHA512 420cf24d3585d1f7b8a81f81e743ec415344b365f1f80447f43e384df39b9825926efd8762bc7864c3c3363e4054b8bc8f8f78871b6a23074994a869da911fdf WHIRLPOOL 11012e772a5ae9ebaf87f8c095e600cc95e8feefe05259916f72a959e4c6b9c5e72a8aa912acf8304ec3942d5b6e854ac7aabcb4290e4886edfa7767eb7e2318 DIST DroidSansMonoSlashed-112_p1.ttf.bz2 74632 SHA256 75da778420bd26d10cc42cab8152d4ce5fb4b86fa34237e361a1782d4e60577b SHA512 bd6031600631fcd51c72232c6a2b42230274b3445b658a2299f4d87613e3a97775b08d10b4a1ad0f3758a5b927593bff0dac6ebb3768d6e44e32c047d858878c WHIRLPOOL 3644bb97585bb4f95d59da30069dfeeed5f8555c45bef2dc3d88439b2c31e8b90f98c4151fef8c9b75cf6bd3c3a1f81aa8eb2b5cf818772eb2d82c20a875d6ee DIST droid-113-r1.tar.bz2 4227725 SHA256 fec9b33203abbc2a5f62a44086de4998dce69649bd78c873e6fd44d1b7d1656e SHA512 1219f54bb153b26bf460d89d866236a4f4ae9010eaf0c1236a9d9633dea7808df7228c6cffcf9635fcfeaa81e5f93e8ece7b02b885a5e9baddc9f522ee07ac64 WHIRLPOOL af083ff533ecc23f573eb42f254209035b7b809d40e45b87b08167a3a9e7de6c73a33ca12a53416a34d5252343014d5fab86293234e77963c1e199ac680952fb EBUILD droid-113-r2.ebuild 1198 SHA256 330e9d1d7ad9cf9ffe7e741aa0d42deab526fd6ecad70241fdcf359cc1c6e87c SHA512 55f4d7c342191c1fda61f0640f0999d339eec99fe566e8cf16ef7b12fdafe543ba933a86774e7ee0bed3f49f91f6dc3418c6393d5cf134b1152e779624bc5ea3 WHIRLPOOL 8ccfd86802fdef3a0845aded49a47a2f9a3d7d488bf786b707703d28fe6723554fd338f33f2d765e778480a4ff64864008880cbe6c02e8e2caf7549e8adeb8cc -MISC ChangeLog 3244 SHA256 5d64ac6c56fb11b91b2db5bbc192ebece088313699e8afb7a36a6f721cf6ef99 SHA512 fd26f17660b95ba0ba941085d23b4ba6956f62a51558a39560e2db826acd6a70a8ebe23e5e6b385432e0ad5596360f8952a7b6d70d819e95682eb9aa46381087 WHIRLPOOL 9b786b18fc066408db094b28317cc6b56fcfdc72c32e7a648851ea25264d6490aae0f43e29e36610fbdfe2ed9d9265ac643ef2e8645874bbdee69ad77322bf21 +MISC ChangeLog 3371 SHA256 213b11ec7dfdf57ae4b8a04b77a3c511fbd05866186b48364a1f05d5bd536be3 SHA512 71ae6704aaa1fdb39efab69b5742d5c15a23776570ee7a7a284f19b04d497215c83bfe51807a1ed5a74c4d3a5e1eb4c11450c1ddf4f21ede3a10d4ec5dd499c1 WHIRLPOOL ce93de22120989f2c34e87c972788622adaa58e743a69d55e9bf74a49d2144189f5e43de515da07dd696b3676052e71b4747806ad30525c735f97121213de8e8 MISC metadata.xml 159 SHA256 952d89bc3335f3d2f69460945016b173913db58759fe7d906f3927909120c890 SHA512 cfd19756be16a4f8750ddaf69904dd799a44e28fbad1771fb6dee8f455e3d640c756cbd8ff7dbd09303424ef9bb0d6a9865d2abf9204705508288a8fb3632334 WHIRLPOOL cb481aabaf1a3f0606384612a2247f015b3303de5d9f0fdd2b3553929fe41220678744fccf970a1fb2861718b0631b6d3f98f2a4804b65df869a56bb3bf1a877 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2.0.21 (GNU/Linux) -iEUEAREIAAYFAlBxWVAACgkQCaWpQKGI+9T7nQCXbOwG9dAoaw5cMvdsjFTtpEyq -zQCfTZ7fUBdyFW+TAfB0wM9GE7ikLv8= -=rnc0 +iQJ8BAEBCABmBQJSFKyAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGODRENkQ2QkI1MzlEMURGNTkyNjYxNjUy +QjI0NzRBRDQzQ0UyOTZFAAoJECskdK1Dzilu/rsP/0kRx2ZhOUb93+MtqbFFLudE +2D0klu0x/x61U95gLVigfiJ41lAQGbk3xe02hcmUoYUURLnZJRvcI3ilONPWOUTQ +qgCW5iiUtc4Lqp8J6VMCSUtV/phc03rq6AQOJU6gCCScdF5aWnHqRC8EFj6ZW9jy +X7v8aLXuEMnpDLjhFfnawi4pPg680AiudVWZhBbvXPz7inkUg02ZJ4yDIQOkiKe2 +WCnMKds2pUXtYVwIJNQHyV3ckd3XZveaysWuT17qO/F2M456sqqKbJQ4q1q5MQ8A +2A+PKFS4Ef4F8Moyt3SVCycdyvtAq3Apnm8mfMuWDHx+XZzbIGHEBT7lX8kqBhn9 +vc56SI3huc3TbDmCwlICUb7aSHYwBlP39FuyJC76uS5lnjrqe5MhMXqvsCCoXQf/ +BC6fvmEAYp0D/JqsuCkktTmX0L1qFYZXe9JbnVM2hAObp88Zv0p7kvIoT0Y7YpjS +NqlWxuHJNQFnKDzk9RIG25Xq+ZGHqd4hrpqTR7sFTgiJEUNx0zH+wrvVlRDQnwaP +/fjldYVJgkpqMxTVM3mLOGoJ9FrTpQmTwMPHJaXi2tzWPOBJx6skTEe81Jxo/PvB +hy/8yE2iOaeM3hNREtid2dgGJszyLHVNsLGDY5pO1jsOU+zhLplcAemXo7oIFmjZ +LsMK2KZiMSw9OlDHMBeB +=ffE2 -----END PGP SIGNATURE----- diff --git a/media-fonts/droid/files/59-google-droid-sans.conf b/media-fonts/droid/files/59-google-droid-sans.conf index 80ba66cde815..172a0cd41509 100644 --- a/media-fonts/droid/files/59-google-droid-sans.conf +++ b/media-fonts/droid/files/59-google-droid-sans.conf @@ -54,9 +54,17 @@ <match target="scan"> <test name="lang" compare="not_eq"> <string>zh-cn</string> + </test> + <test name="lang" compare="not_eq"> <string>zh-sg</string> + </test> + <test name="lang" compare="not_eq"> <string>zh-hk</string> + </test> + <test name="lang" compare="not_eq"> <string>zh-tw</string> + </test> + <test name="lang" compare="not_eq"> <string>zh</string> </test> <test name="family"> @@ -87,11 +95,19 @@ </edit> </match> <match target="scan"> - <test name="lang"> + <test name="lang" compare="not_eq"> <string>zh-cn</string> + </test> + <test name="lang" compare="not_eq"> <string>zh-sg</string> + </test> + <test name="lang" compare="not_eq"> <string>zh-hk</string> + </test> + <test name="lang" compare="not_eq"> <string>zh-tw</string> + </test> + <test name="lang" compare="not_eq"> <string>zh</string> </test> <test name="family"> |