* [gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/
@ 2016-03-28 21:41 99% Mike Frysinger
0 siblings, 0 replies; 1+ results
From: Mike Frysinger @ 2016-03-28 21:41 UTC (permalink / raw
To: gentoo-commits
commit: 42da3c45bbe074f8d25decfcdd7cd8d0388c6f39
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 28 21:38:33 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon Mar 28 21:41:10 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42da3c45
app-emulation/qemu: use l10n.eclass to respect LINGUAS #577814
app-emulation/qemu/qemu-2.5.0-r2.ebuild | 33 +++++++++++++++++++++++++++++----
app-emulation/qemu/qemu-9999.ebuild | 33 +++++++++++++++++++++++++++++----
2 files changed, 58 insertions(+), 8 deletions(-)
diff --git a/app-emulation/qemu/qemu-2.5.0-r2.ebuild b/app-emulation/qemu/qemu-2.5.0-r2.ebuild
index 5621047..072691e 100644
--- a/app-emulation/qemu/qemu-2.5.0-r2.ebuild
+++ b/app-emulation/qemu/qemu-2.5.0-r2.ebuild
@@ -7,8 +7,10 @@ EAPI=5
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="ncurses,readline"
+PLOCALES="de_DE fr_FR hu it tr zh_CN"
+
inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
- user udev fcaps readme.gentoo pax-utils
+ user udev fcaps readme.gentoo pax-utils l10n
BACKPORTS=
@@ -295,6 +297,29 @@ check_targets() {
popd >/dev/null
}
+handle_locales() {
+ # Make sure locale list is kept up-to-date.
+ local detected sorted
+ detected=$(echo $(cd po && printf '%s\n' *.po | grep -v messages.po | sed 's:.po$::' | sort -u))
+ sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
+ if [[ ${sorted} != "${detected}" ]] ; then
+ eerror "The ebuild needs to be kept in sync."
+ eerror "PLOCALES: ${sorted}"
+ eerror " po/*.po: ${detected}"
+ die "sync PLOCALES"
+ fi
+
+ # Deal with selective install of locales.
+ if use nls ; then
+ # Delete locales the user does not want. #577814
+ rm_loc() { rm po/$1.po || die; }
+ l10n_for_each_disabled_locale_do rm_loc
+ else
+ # Cheap hack to disable gettext .mo generation.
+ rm -f po/*.po
+ fi
+}
+
src_prepare() {
check_targets IUSE_SOFTMMU_TARGETS softmmu
check_targets IUSE_USER_TARGETS linux-user
@@ -304,9 +329,6 @@ src_prepare() {
-e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \
Makefile Makefile.target || die
- # Cheap hack to disable gettext .mo generation.
- use nls || rm -f po/*.po
-
epatch "${FILESDIR}"/qemu-2.5.0-cflags.patch
[[ -n ${BACKPORTS} ]] && \
EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
@@ -337,6 +359,9 @@ src_prepare() {
MAKEOPTS+=" V=1"
epatch_user
+
+ # Run after we've applied all patches.
+ handle_locales
}
##
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 70f595e..acecad8 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -7,8 +7,10 @@ EAPI=5
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="ncurses,readline"
+PLOCALES="de_DE fr_FR hu it tr zh_CN"
+
inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
- user udev fcaps readme.gentoo pax-utils
+ user udev fcaps readme.gentoo pax-utils l10n
BACKPORTS=
@@ -295,6 +297,29 @@ check_targets() {
popd >/dev/null
}
+handle_locales() {
+ # Make sure locale list is kept up-to-date.
+ local detected sorted
+ detected=$(echo $(cd po && printf '%s\n' *.po | grep -v messages.po | sed 's:.po$::' | sort -u))
+ sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
+ if [[ ${sorted} != "${detected}" ]] ; then
+ eerror "The ebuild needs to be kept in sync."
+ eerror "PLOCALES: ${sorted}"
+ eerror " po/*.po: ${detected}"
+ die "sync PLOCALES"
+ fi
+
+ # Deal with selective install of locales.
+ if use nls ; then
+ # Delete locales the user does not want. #577814
+ rm_loc() { rm po/$1.po || die; }
+ l10n_for_each_disabled_locale_do rm_loc
+ else
+ # Cheap hack to disable gettext .mo generation.
+ rm -f po/*.po
+ fi
+}
+
src_prepare() {
check_targets IUSE_SOFTMMU_TARGETS softmmu
check_targets IUSE_USER_TARGETS linux-user
@@ -304,9 +329,6 @@ src_prepare() {
-e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \
Makefile Makefile.target || die
- # Cheap hack to disable gettext .mo generation.
- use nls || rm -f po/*.po
-
epatch "${FILESDIR}"/qemu-2.5.0-cflags.patch
[[ -n ${BACKPORTS} ]] && \
EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
@@ -319,6 +341,9 @@ src_prepare() {
MAKEOPTS+=" V=1"
epatch_user
+
+ # Run after we've applied all patches.
+ handle_locales
}
##
^ permalink raw reply related [relevance 99%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2016-03-28 21:41 99% [gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/ Mike Frysinger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox