pinkbyte 14/06/23 10:02:57 Modified: ChangeLog q4wine-1.1_p2-r1.ebuild Log: Fix locale handling by using full locale names, wrt bug #496508. Minor QA fixes. Thanks to Kjell Claesson <kjell.claesson AT epost.tidanet.se> for discovering this issue (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)
Revision Changes Path 1.51 app-emulation/q4wine/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/q4wine/ChangeLog?rev=1.51&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/q4wine/ChangeLog?rev=1.51&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/q4wine/ChangeLog?r1=1.50&r2=1.51 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/q4wine/ChangeLog,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- ChangeLog 2 Jan 2014 20:13:14 -0000 1.50 +++ ChangeLog 23 Jun 2014 10:02:57 -0000 1.51 @@ -1,6 +1,11 @@ # ChangeLog for app-emulation/q4wine # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/q4wine/ChangeLog,v 1.50 2014/01/02 20:13:14 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/q4wine/ChangeLog,v 1.51 2014/06/23 10:02:57 pinkbyte Exp $ + + 23 Jun 2014; Sergey Popov <[email protected]> q4wine-1.1_p2-r1.ebuild: + Fix locale handling by using full locale names, wrt bug #496508. Minor QA + fixes. Thanks to Kjell Claesson <kjell.claesson AT epost.tidanet.se> for + discovering this issue 02 Jan 2014; Markos Chandras <[email protected]> q4wine-1.1_p2-r1.ebuild: Depend on qtsingleapplication[X] to fix configure failure 1.3 app-emulation/q4wine/q4wine-1.1_p2-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/q4wine/q4wine-1.1_p2-r1.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/q4wine/q4wine-1.1_p2-r1.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/q4wine/q4wine-1.1_p2-r1.ebuild?r1=1.2&r2=1.3 Index: q4wine-1.1_p2-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/q4wine/q4wine-1.1_p2-r1.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- q4wine-1.1_p2-r1.ebuild 2 Jan 2014 20:13:14 -0000 1.2 +++ q4wine-1.1_p2-r1.ebuild 23 Jun 2014 10:02:57 -0000 1.3 @@ -1,10 +1,10 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/q4wine/q4wine-1.1_p2-r1.ebuild,v 1.2 2014/01/02 20:13:14 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/q4wine/q4wine-1.1_p2-r1.ebuild,v 1.3 2014/06/23 10:02:57 pinkbyte Exp $ EAPI=5 -PLOCALES="af cs de en es fa he it ru uk pl pt" +PLOCALES="af_ZA cs_CZ de_DE en_US es_ES fa_IR he_IL it_IT pl_PL pt_BR ru_RU uk_UA" PLOCALE_BACKUP="en_US" inherit cmake-utils l10n @@ -14,8 +14,8 @@ # Upstream names the package PV-rX. We change that to # PV_pX so we can use portage revisions. -MY_PV=${PV/_p/-r} -MY_P=${PN}-${MY_PV} +MY_PV="${PV/_p/-r}" +MY_P="${PN}-${MY_PV}" SRC_URI="mirror://sourceforge/${PN}/${PN}/${PN}%20${MY_PV}/${MY_P}.tar.bz2" LICENSE="GPL-3" @@ -26,7 +26,7 @@ DEPEND=" dev-qt/qtcore:4 dev-qt/qtgui:4 - dev-qt/qtsingleapplication[X(+)] + dev-qt/qtsingleapplication[X] dev-qt/qtsql:4[sqlite] dbus? ( dev-qt/qtdbus:4 ) " @@ -38,22 +38,19 @@ icoutils? ( >=media-gfx/icoutils-0.26.0 ) " -S=${WORKDIR}/${MY_P} +S="${WORKDIR}/${MY_P}" -DOCS=(README AUTHORS ChangeLog) - -remove_from_LINGUAS() { - sed -i -e "/SET\s*(\s*LINGUAS / s: ${1}_\w\w::" \ - src/CMakeLists.txt || die -} - -src_prepare() { - cmake-utils_src_prepare - l10n_for_each_disabled_locale_do remove_from_LINGUAS -} +DOCS=( AUTHORS ChangeLog README ) src_configure() { + local enabled_linguas + construct_LINGUAS() { + local current_locale="$(echo ${1} | tr '[:upper:]' '[:lower:]')" + enabled_linguas="${enabled_linguas};${current_locale}" + } + l10n_for_each_locale_do construct_LINGUAS local mycmakeargs=( + -DLINGUAS="${enabled_linguas}" -DQT5=OFF -DWITH_SYSTEM_SINGLEAPP=ON $(cmake-utils_use debug)
