app-emulation/qemu: force C locale for sorting to workaround glibc bug #564936

diff --git a/app-emulation/qemu/qemu-2.4.0-r1.ebuild b/app-emulation/qemu/qemu-2.4.0-r1.ebuild
index ba77ef86b3fc9404b154e8d778c2f70c57494df4..8d50bd3e7b8f31c113136a1866754453cf5198bf 100644 (file)
--- a/app-emulation/qemu/qemu-2.4.0-r1.ebuild
+++ b/app-emulation/qemu/qemu-2.4.0-r1.ebuild
@@ -275,8 +275,9 @@ check_targets() {
 
        pushd "${S}"/default-configs >/dev/null || die
 
-       detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | sort -u))
-       sorted=$(echo $(printf '%s\n' ${!var} | sort -u))
+       # Force C locale until glibc is updated. #564936
+       detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
+       sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
        if [[ ${sorted} != "${detected}" ]] ; then
                eerror "The ebuild needs to be kept in sync."
                eerror "${var}: ${sorted}"

diff --git a/app-emulation/qemu/qemu-2.4.0.1-r1.ebuild b/app-emulation/qemu/qemu-2.4.0.1-r1.ebuild
index 71297679fe9a12c1145492a791f7b9185d405e62..6b53c66421f6206047c1748f547172d78b56ea9e 100644 (file)
--- a/app-emulation/qemu/qemu-2.4.0.1-r1.ebuild
+++ b/app-emulation/qemu/qemu-2.4.0.1-r1.ebuild
@@ -275,8 +275,9 @@ check_targets() {
 
        pushd "${S}"/default-configs >/dev/null || die
 
-       detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | sort -u))
-       sorted=$(echo $(printf '%s\n' ${!var} | sort -u))
+       # Force C locale until glibc is updated. #564936
+       detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
+       sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
        if [[ ${sorted} != "${detected}" ]] ; then
                eerror "The ebuild needs to be kept in sync."
                eerror "${var}: ${sorted}"

diff --git a/app-emulation/qemu/qemu-2.4.0.1.ebuild b/app-emulation/qemu/qemu-2.4.0.1.ebuild
index 306d7720b0e7df6905ef40358e7bfff56ef0b346..50ceedb9901e10baf5f3f4f654c20fe54d350125 100644 (file)
--- a/app-emulation/qemu/qemu-2.4.0.1.ebuild
+++ b/app-emulation/qemu/qemu-2.4.0.1.ebuild
@@ -275,8 +275,9 @@ check_targets() {
 
        pushd "${S}"/default-configs >/dev/null || die
 
-       detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | sort -u))
-       sorted=$(echo $(printf '%s\n' ${!var} | sort -u))
+       # Force C locale until glibc is updated. #564936
+       detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
+       sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
        if [[ ${sorted} != "${detected}" ]] ; then
                eerror "The ebuild needs to be kept in sync."
                eerror "${var}: ${sorted}"

diff --git a/app-emulation/qemu/qemu-2.4.1.ebuild b/app-emulation/qemu/qemu-2.4.1.ebuild
index 3db908d92ed1adfb41d2eb5540768f11f76d19c4..63252bea4b2793aef6296a59236e3d698267b7c4 100644 (file)
--- a/app-emulation/qemu/qemu-2.4.1.ebuild
+++ b/app-emulation/qemu/qemu-2.4.1.ebuild
@@ -275,8 +275,9 @@ check_targets() {
 
        pushd "${S}"/default-configs >/dev/null || die
 
-       detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | sort -u))
-       sorted=$(echo $(printf '%s\n' ${!var} | sort -u))
+       # Force C locale until glibc is updated. #564936
+       detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
+       sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
        if [[ ${sorted} != "${detected}" ]] ; then
                eerror "The ebuild needs to be kept in sync."
                eerror "${var}: ${sorted}"

diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index a514240afe09426af43d9581ddd666157fcbe69f..3123715862833490c706f7560256ea9751add486 100644 (file)
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -281,8 +281,9 @@ check_targets() {
 
        pushd "${S}"/default-configs >/dev/null || die
 
-       detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | sort -u))
-       sorted=$(echo $(printf '%s\n' ${!var} | sort -u))
+       # Force C locale until glibc is updated. #564936
+       detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
+       sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
        if [[ ${sorted} != "${detected}" ]] ; then
                eerror "The ebuild needs to be kept in sync."
                eerror "${var}: ${sorted}"