| 1 |
commit: 7efce20edc636e00f960eeeab798208ee3cccfcc |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 8 17:52:12 2018 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 8 18:11:01 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7efce20e |
| 7 |
|
| 8 |
www-apps/mod_survey: Remove linguas_* USE flags. |
| 9 |
|
| 10 |
Don't bother with setting a default language, which can never work |
| 11 |
reliably when it is based on the order of entries in LINGUAS. |
| 12 |
Stay with the upstream default (English) instead, which can be changed |
| 13 |
in the config file. |
| 14 |
|
| 15 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
| 16 |
|
| 17 |
www-apps/mod_survey/mod_survey-3.2.5.ebuild | 33 ++++------------------------- |
| 18 |
1 file changed, 4 insertions(+), 29 deletions(-) |
| 19 |
|
| 20 |
diff --git a/www-apps/mod_survey/mod_survey-3.2.5.ebuild b/www-apps/mod_survey/mod_survey-3.2.5.ebuild |
| 21 |
index 130996dca76..4fef9c59543 100644 |
| 22 |
--- a/www-apps/mod_survey/mod_survey-3.2.5.ebuild |
| 23 |
+++ b/www-apps/mod_survey/mod_survey-3.2.5.ebuild |
| 24 |
@@ -1,4 +1,4 @@ |
| 25 |
-# Copyright 1999-2015 Gentoo Foundation |
| 26 |
+# Copyright 1999-2018 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
|
| 29 |
inherit depend.apache webapp |
| 30 |
@@ -17,11 +17,6 @@ LICENSE="GPL-2" |
| 31 |
KEYWORDS="~amd64 ~ppc ~x86" |
| 32 |
IUSE="doc mysql nls postgres" |
| 33 |
|
| 34 |
-LANGS="en de fr it sv" |
| 35 |
-for i in ${LANGS}; do |
| 36 |
- IUSE="${IUSE} linguas_${i}" |
| 37 |
-done |
| 38 |
- |
| 39 |
DEPEND=">=dev-lang/perl-5.6.1" |
| 40 |
RDEPEND="${DEPEND} |
| 41 |
>=www-apache/mod_perl-1.99 |
| 42 |
@@ -36,28 +31,9 @@ pkg_setup() { |
| 43 |
has_apache |
| 44 |
|
| 45 |
if use nls; then |
| 46 |
- for i in ${LINGUAS}; do |
| 47 |
- if has linguas_${i} ${IUSE}; then |
| 48 |
- if use linguas_${i}; then |
| 49 |
- locallang="${i}" |
| 50 |
- ewarn "${i} from the LINGUAS variable has been set as the" |
| 51 |
- ewarn "default language. This can be overriden on a" |
| 52 |
- ewarn "per-survey basis, or changed in" |
| 53 |
- ewarn "${APACHE_MODULES_CONFDIR}/98_${PN}.conf" |
| 54 |
- ewarn |
| 55 |
- break |
| 56 |
- fi |
| 57 |
- else |
| 58 |
- einfo "LINGUAS=${i} is not supported by ${P}" |
| 59 |
- shift |
| 60 |
- fi |
| 61 |
- done |
| 62 |
- fi |
| 63 |
- |
| 64 |
- if [[ -z ${locallang} ]]; then |
| 65 |
- [[ -n "${LINGUAS}" ]] && ewarn "None of ${LINGUAS} supported." |
| 66 |
- use nls && ewarn "Will use English as default language." |
| 67 |
- locallang="en" |
| 68 |
+ ewarn "English will be set as the default language." |
| 69 |
+ ewarn "This can be overriden on a per-survey basis, or changed in" |
| 70 |
+ ewarn "${APACHE_MODULES_CONFDIR}/98_${PN}.conf" |
| 71 |
fi |
| 72 |
} |
| 73 |
|
| 74 |
@@ -66,7 +42,6 @@ src_unpack() { |
| 75 |
cd "${S}" |
| 76 |
|
| 77 |
sed -i \ |
| 78 |
- -e "s|\$lang = \"en\"|\$lang = \"${locallang}\"|" \ |
| 79 |
-e "s|/usr/local/mod_survey/|${D}/usr/lib/mod_survey/|g" \ |
| 80 |
installer.pl |
Archives