summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen de Groot <yngwin@gentoo.org>2013-08-21 12:03:09 +0000
committerBen de Groot <yngwin@gentoo.org>2013-08-21 12:03:09 +0000
commit1953c560e5c2b2f9c2f456b9b8ebc4c7e50b9e1a (patch)
treeda38ea4a193607334b07f0c10a0d3aa1c5b2a62c /media-fonts
parentamd64/x86 stable wrt bug #472428 (diff)
downloadgentoo-2-1953c560e5c2b2f9c2f456b9b8ebc4c7e50b9e1a.tar.gz
gentoo-2-1953c560e5c2b2f9c2f456b9b8ebc4c7e50b9e1a.tar.bz2
gentoo-2-1953c560e5c2b2f9c2f456b9b8ebc4c7e50b9e1a.zip
Fix multimple values in test, bug #471083
(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 0x2B2474AD43CE296E!)
Diffstat (limited to 'media-fonts')
-rw-r--r--media-fonts/droid/ChangeLog7
-rw-r--r--media-fonts/droid/files/59-google-droid-sans.conf18
2 files changed, 22 insertions, 3 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/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">