[gentoo-commits] repo/gentoo:master commit in: www-apps/mod_survey/

[gentoo-commits] repo/gentoo:master commit in: www-apps/mod_survey/

[Ulrich Müller]

commit:     7efce20edc636e00f960eeeab798208ee3cccfcc
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  8 17:52:12 2018 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Jan  8 18:11:01 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7efce20e

www-apps/mod_survey: Remove linguas_* USE flags.

Don't bother with setting a default language, which can never work
reliably when it is based on the order of entries in LINGUAS.
Stay with the upstream default (English) instead, which can be changed
in the config file.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 www-apps/mod_survey/mod_survey-3.2.5.ebuild | 33 ++++-------------------------
 1 file changed, 4 insertions(+), 29 deletions(-)

diff --git a/www-apps/mod_survey/mod_survey-3.2.5.ebuild b/www-apps/mod_survey/mod_survey-3.2.5.ebuild
index 130996dca76..4fef9c59543 100644
--- a/www-apps/mod_survey/mod_survey-3.2.5.ebuild
+++ b/www-apps/mod_survey/mod_survey-3.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit depend.apache webapp
@@ -17,11 +17,6 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc mysql nls postgres"
 
-LANGS="en de fr it sv"
-for i in ${LANGS}; do
-	IUSE="${IUSE} linguas_${i}"
-done
-
 DEPEND=">=dev-lang/perl-5.6.1"
 RDEPEND="${DEPEND}
 	>=www-apache/mod_perl-1.99
@@ -36,28 +31,9 @@ pkg_setup() {
 	has_apache
 
 	if use nls; then
-		for i in ${LINGUAS}; do
-			if has linguas_${i} ${IUSE}; then
-				if use linguas_${i}; then
-					locallang="${i}"
-					ewarn "${i} from the LINGUAS variable has been set as the"
-					ewarn "default language. This can be overriden on a"
-					ewarn "per-survey basis, or changed in"
-					ewarn "${APACHE_MODULES_CONFDIR}/98_${PN}.conf"
-					ewarn
-					break
-				fi
-			else
-				einfo "LINGUAS=${i} is not supported by ${P}"
-				shift
-			fi
-		done
-	fi
-
-	if [[ -z ${locallang} ]]; then
-		[[ -n "${LINGUAS}" ]] && ewarn "None of ${LINGUAS} supported."
-		use nls && ewarn "Will use English as default language."
-		locallang="en"
+		ewarn "English will be set as the default language."
+		ewarn "This can be overriden on a per-survey basis, or changed in"
+		ewarn "${APACHE_MODULES_CONFDIR}/98_${PN}.conf"
 	fi
 }
 
@@ -66,7 +42,6 @@ src_unpack() {
 	cd "${S}"
 
 	sed -i \
-		-e "s|\$lang = \"en\"|\$lang = \"${locallang}\"|" \
 		-e "s|/usr/local/mod_survey/|${D}/usr/lib/mod_survey/|g" \
 		installer.pl