[gentoo-commits] repo/gentoo:master commit in: app-office/lyx/

["Ulrich Müller" <ulm@gentoo.org>]

commit:     b201a68e1ee198f74c200ff2a07245e492e03551
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  6 20:20:58 2018 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Jan  6 20:22:57 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b201a68e

app-office/lyx: Remove linguas_* from IUSE.

Migrate support for Hebrew (which requires an additional dependency)
from linguas_he to l10n_he.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-office/lyx/lyx-2.0.8.1-r1.ebuild | 17 +++++------------
 app-office/lyx/lyx-2.1.5-r1.ebuild   | 17 +++++------------
 app-office/lyx/lyx-2.2.2-r1.ebuild   | 17 +++++------------
 app-office/lyx/lyx-2.2.3-r1.ebuild   | 17 +++++------------
 app-office/lyx/lyx-2.2.3-r2.ebuild   | 17 +++++------------
 app-office/lyx/lyx-2.2.3.ebuild      | 17 +++++------------
 6 files changed, 30 insertions(+), 72 deletions(-)

diff --git a/app-office/lyx/lyx-2.0.8.1-r1.ebuild b/app-office/lyx/lyx-2.0.8.1-r1.ebuild
index 6d3194d8af9..3e87c826bd1 100644
--- a/app-office/lyx/lyx-2.0.8.1-r1.ebuild
+++ b/app-office/lyx/lyx-2.0.8.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,14 +19,7 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/${MY_P}.tar.xz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x64-macos ~x86-macos"
-IUSE="cups debug nls +latex monolithic-build html rtf dot docbook dia subversion rcs svg gnumeric +hunspell aspell enchant"
-
-LANGS="ar ca cs de da el en es eu fi fr gl he hu ia id it ja nb nn pl pt ro ru sk sr sv tr uk zh_CN zh_TW"
-
-for X in ${LANGS}; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
+IUSE="cups debug nls +latex monolithic-build html rtf dot docbook dia subversion rcs svg gnumeric +hunspell aspell enchant l10n_he"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DOCS=( ANNOUNCE NEWS README RELEASE-NOTES UPGRADING )
@@ -66,7 +59,7 @@ RDEPEND="${COMMONDEPEND}
 			app-text/unrtf
 			dev-tex/html2latex
 		)
-	linguas_he? ( dev-tex/culmus-latex )
+	l10n_he? ( dev-tex/culmus-latex )
 	docbook? ( app-text/sgmltools-lite )
 	dot? ( media-gfx/graphviz )
 	dia? ( app-office/dia )
@@ -112,7 +105,7 @@ src_configure() {
 src_install() {
 	default
 
-	if use linguas_he ; then
+	if use l10n_he ; then
 		echo "\bind_file cua" > "${T}"/hebrew.bind
 		echo "\bind \"F12\" \"language hebrew\"" >> "${T}"/hebrew.bind
 
@@ -156,7 +149,7 @@ pkg_postinst() {
 	fi
 
 	# instructions for RTL support. See also bug 168331.
-	if use linguas_he || use linguas_ar; then
+	if use l10n_he || has he ${LINGUAS} || has ar ${LINGUAS} ; then
 		elog
 		elog "Enabling RTL support in LyX:"
 		elog "If you intend to use a RTL language (such as Hebrew or Arabic)"

diff --git a/app-office/lyx/lyx-2.1.5-r1.ebuild b/app-office/lyx/lyx-2.1.5-r1.ebuild
index 3e4ad476655..13dd28fd8d6 100644
--- a/app-office/lyx/lyx-2.1.5-r1.ebuild
+++ b/app-office/lyx/lyx-2.1.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,14 +19,7 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.1.x/${MY_P}.tar.xz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x64-macos ~x86-macos"
-IUSE="cups debug nls +latex monolithic-build html rtf dot docbook dia subversion rcs svg gnumeric +hunspell aspell enchant"
-
-LANGS="ar ca cs de da el en es eu fi fr gl he hu ia id it ja nb nn pl pt ro ru sk sr sv tr uk zh_CN zh_TW"
-
-for X in ${LANGS}; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
+IUSE="cups debug nls +latex monolithic-build html rtf dot docbook dia subversion rcs svg gnumeric +hunspell aspell enchant l10n_he"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DOCS=( ANNOUNCE NEWS README RELEASE-NOTES UPGRADING )
@@ -66,7 +59,7 @@ RDEPEND="${COMMONDEPEND}
 			app-text/unrtf
 			dev-tex/html2latex
 		)
-	linguas_he? ( dev-tex/culmus-latex )
+	l10n_he? ( dev-tex/culmus-latex )
 	docbook? ( app-text/sgmltools-lite )
 	dot? ( media-gfx/graphviz )
 	dia? ( app-office/dia )
@@ -112,7 +105,7 @@ src_configure() {
 src_install() {
 	default
 
-	if use linguas_he ; then
+	if use l10n_he ; then
 		echo "\bind_file cua" > "${T}"/hebrew.bind
 		echo "\bind \"F12\" \"language hebrew\"" >> "${T}"/hebrew.bind
 
@@ -155,7 +148,7 @@ pkg_postinst() {
 	fi
 
 	# instructions for RTL support. See also bug 168331.
-	if use linguas_he || use linguas_ar; then
+	if use l10n_he || has he ${LINGUAS} || has ar ${LINGUAS} ; then
 		elog
 		elog "Enabling RTL support in LyX:"
 		elog "If you intend to use a RTL language (such as Hebrew or Arabic)"

diff --git a/app-office/lyx/lyx-2.2.2-r1.ebuild b/app-office/lyx/lyx-2.2.2-r1.ebuild
index fdc8702116d..8463d966225 100644
--- a/app-office/lyx/lyx-2.2.2-r1.ebuild
+++ b/app-office/lyx/lyx-2.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,14 +19,7 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/${MY_P}.tar.xz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos"
-IUSE="cups debug nls +latex monolithic-build html rtf dot docbook dia subversion rcs svg gnumeric +hunspell aspell enchant +qt4 qt5"
-
-LANGS="ar ca cs da de el en es eu fi fr gl he hu ia id it ja nb nn pl pt_BR pt_PT ro ru sk sr sv tr uk zh_CN zh_TW"
-
-for X in ${LANGS}; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
+IUSE="cups debug nls +latex monolithic-build html rtf dot docbook dia subversion rcs svg gnumeric +hunspell aspell enchant +qt4 qt5 l10n_he"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	qt4? ( !qt5 )
 	qt5? ( !qt4 )"
@@ -68,7 +61,7 @@ RDEPEND="${COMMONDEPEND}
 			app-text/unrtf
 			dev-tex/html2latex
 		)
-	linguas_he? ( dev-tex/culmus-latex )
+	l10n_he? ( dev-tex/culmus-latex )
 	docbook? ( app-text/sgmltools-lite )
 	dot? ( media-gfx/graphviz )
 	dia? ( app-office/dia )
@@ -126,7 +119,7 @@ src_configure() {
 src_install() {
 	default
 
-	if use linguas_he ; then
+	if use l10n_he ; then
 		echo "\bind_file cua" > "${T}"/hebrew.bind
 		echo "\bind \"F12\" \"language hebrew\"" >> "${T}"/hebrew.bind
 
@@ -169,7 +162,7 @@ pkg_postinst() {
 	fi
 
 	# instructions for RTL support. See also bug 168331.
-	if use linguas_he || use linguas_ar; then
+	if use l10n_he || has he ${LINGUAS} || has ar ${LINGUAS} ; then
 		elog
 		elog "Enabling RTL support in LyX:"
 		elog "If you intend to use a RTL language (such as Hebrew or Arabic)"

diff --git a/app-office/lyx/lyx-2.2.3-r1.ebuild b/app-office/lyx/lyx-2.2.3-r1.ebuild
index 80ff95ca394..62965b98bfc 100644
--- a/app-office/lyx/lyx-2.2.3-r1.ebuild
+++ b/app-office/lyx/lyx-2.2.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,14 +19,7 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/${MY_P}.tar.xz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x64-macos ~x86-macos"
-IUSE="aspell cups debug docbook dia dot enchant gnumeric html +hunspell +latex monolithic-build nls +qt5 rcs rtf subversion svg"
-
-LANGS="ar ca cs da de el en es eu fi fr gl he hu ia id it ja nb nn pl pt_BR pt_PT ro ru sk sr sv tr uk zh_CN zh_TW"
-
-for X in ${LANGS}; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
+IUSE="aspell cups debug docbook dia dot enchant gnumeric html +hunspell +latex monolithic-build nls +qt5 rcs rtf subversion svg l10n_he"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
@@ -64,7 +57,7 @@ RDEPEND="${PYTHON_DEPS}
 			dev-tex/tth
 		)
 	)
-	linguas_he? ( dev-tex/culmus-latex )
+	l10n_he? ( dev-tex/culmus-latex )
 	!qt5? (
 		dev-qt/qtcore:4
 		dev-qt/qtgui:4
@@ -130,7 +123,7 @@ src_configure() {
 src_install() {
 	default
 
-	if use linguas_he ; then
+	if use l10n_he ; then
 		echo "\bind_file cua" > "${T}"/hebrew.bind
 		echo "\bind \"F12\" \"language hebrew\"" >> "${T}"/hebrew.bind
 
@@ -173,7 +166,7 @@ pkg_postinst() {
 	fi
 
 	# instructions for RTL support. See also bug 168331.
-	if use linguas_he || use linguas_ar; then
+	if use l10n_he || has he ${LINGUAS} || has ar ${LINGUAS} ; then
 		elog
 		elog "Enabling RTL support in LyX:"
 		elog "If you intend to use a RTL language (such as Hebrew or Arabic)"

diff --git a/app-office/lyx/lyx-2.2.3-r2.ebuild b/app-office/lyx/lyx-2.2.3-r2.ebuild
index d1fbcd95e53..edd854b9238 100644
--- a/app-office/lyx/lyx-2.2.3-r2.ebuild
+++ b/app-office/lyx/lyx-2.2.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,14 +19,7 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/${MY_P}.tar.xz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos"
-IUSE="aspell cups debug docbook dia dot enchant gnumeric html +hunspell +latex monolithic-build nls +qt5 rcs rtf subversion svg"
-
-LANGS="ar ca cs da de el en es eu fi fr gl he hu ia id it ja nb nn pl pt_BR pt_PT ro ru sk sr sv tr uk zh_CN zh_TW"
-
-for X in ${LANGS}; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
+IUSE="aspell cups debug docbook dia dot enchant gnumeric html +hunspell +latex monolithic-build nls +qt5 rcs rtf subversion svg l10n_he"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
@@ -64,7 +57,7 @@ RDEPEND="${PYTHON_DEPS}
 			dev-tex/tth
 		)
 	)
-	linguas_he? ( dev-tex/culmus-latex )
+	l10n_he? ( dev-tex/culmus-latex )
 	!qt5? (
 		dev-qt/qtcore:4
 		dev-qt/qtgui:4
@@ -130,7 +123,7 @@ src_configure() {
 src_install() {
 	default
 
-	if use linguas_he ; then
+	if use l10n_he ; then
 		echo "\bind_file cua" > "${T}"/hebrew.bind
 		echo "\bind \"F12\" \"language hebrew\"" >> "${T}"/hebrew.bind
 
@@ -173,7 +166,7 @@ pkg_postinst() {
 	fi
 
 	# instructions for RTL support. See also bug 168331.
-	if use linguas_he || use linguas_ar; then
+	if use l10n_he || has he ${LINGUAS} || has ar ${LINGUAS} ; then
 		elog
 		elog "Enabling RTL support in LyX:"
 		elog "If you intend to use a RTL language (such as Hebrew or Arabic)"

diff --git a/app-office/lyx/lyx-2.2.3.ebuild b/app-office/lyx/lyx-2.2.3.ebuild
index fdc8702116d..8463d966225 100644
--- a/app-office/lyx/lyx-2.2.3.ebuild
+++ b/app-office/lyx/lyx-2.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,14 +19,7 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/${MY_P}.tar.xz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos"
-IUSE="cups debug nls +latex monolithic-build html rtf dot docbook dia subversion rcs svg gnumeric +hunspell aspell enchant +qt4 qt5"
-
-LANGS="ar ca cs da de el en es eu fi fr gl he hu ia id it ja nb nn pl pt_BR pt_PT ro ru sk sr sv tr uk zh_CN zh_TW"
-
-for X in ${LANGS}; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
+IUSE="cups debug nls +latex monolithic-build html rtf dot docbook dia subversion rcs svg gnumeric +hunspell aspell enchant +qt4 qt5 l10n_he"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	qt4? ( !qt5 )
 	qt5? ( !qt4 )"
@@ -68,7 +61,7 @@ RDEPEND="${COMMONDEPEND}
 			app-text/unrtf
 			dev-tex/html2latex
 		)
-	linguas_he? ( dev-tex/culmus-latex )
+	l10n_he? ( dev-tex/culmus-latex )
 	docbook? ( app-text/sgmltools-lite )
 	dot? ( media-gfx/graphviz )
 	dia? ( app-office/dia )
@@ -126,7 +119,7 @@ src_configure() {
 src_install() {
 	default
 
-	if use linguas_he ; then
+	if use l10n_he ; then
 		echo "\bind_file cua" > "${T}"/hebrew.bind
 		echo "\bind \"F12\" \"language hebrew\"" >> "${T}"/hebrew.bind
 
@@ -169,7 +162,7 @@ pkg_postinst() {
 	fi
 
 	# instructions for RTL support. See also bug 168331.
-	if use linguas_he || use linguas_ar; then
+	if use l10n_he || has he ${LINGUAS} || has ar ${LINGUAS} ; then
 		elog
 		elog "Enabling RTL support in LyX:"
 		elog "If you intend to use a RTL language (such as Hebrew or Arabic)"