diff options
Diffstat (limited to 'www-apps')
| -rw-r--r-- | www-apps/Manifest.gz | bin | 16177 -> 16181 bytes | |||
| -rw-r--r-- | www-apps/mod_survey/Manifest | 2 | ||||
| -rw-r--r-- | www-apps/mod_survey/mod_survey-3.2.5.ebuild | 33 |
3 files changed, 5 insertions, 30 deletions
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz Binary files differindex 8ac6ed6c3da7..c063002b79e4 100644 --- a/www-apps/Manifest.gz +++ b/www-apps/Manifest.gz diff --git a/www-apps/mod_survey/Manifest b/www-apps/mod_survey/Manifest index a4ba0c6254e9..13a0db9f888d 100644 --- a/www-apps/mod_survey/Manifest +++ b/www-apps/mod_survey/Manifest @@ -1,5 +1,5 @@ AUX 98_mod_survey.conf 4327 BLAKE2B 41b45b8c94b798cdefe7e8b2bc67ff1763cf39546b3cd509e2cbdacba4b766d3c70ec64409ff6427690a5172f035e9b4fc0c729172e9d347bce3d74f70b272a4 SHA512 37c6b7eb96eafa32ea3eb67d1c74f9139d81f2a9b8bc08ccbd40b7f1c94479e9a6f7ac1bff593238567be352fe1b39f8da8bdac40ea45e56bd6ca931c478b689 DIST modsurvey-3.2.5.tgz 508271 BLAKE2B 63e45151417920c6e678836d3f8fec040c8afc8fabae128526764b69ac9ea5498740a252bfad8975dafcc89bb258a0f0671ed66ff646798a87bf256d69512bd2 SHA512 627b976e3f5bae180456daae2f4544d74abf1d0dafc3b3b43332ef055f4e3a9b66e4f5dfe7b997008237206963c203d518372106cb27073d29966e19271b0149 DIST modsurvey-docs-3.2.5.tgz 678356 BLAKE2B 46e2f0653484db96beba406feeeb45483f51fb41f50af288169f9314bd827dc48248882a24225c7169995ae942ab11a1f994e658a2451b336a13dad34f6ed41f SHA512 3511720922668a2d55f675366c9b7e3e9a67fea8abafa39018475ec5734b496e8d6c8ba313e5d2182028ae324aaff84702c09380a1ffb1cbcc14b5cbfbfb4403 -EBUILD mod_survey-3.2.5.ebuild 2333 BLAKE2B 1bf6e47dbb8f572b68609195c7e21a10cc34435a040683f8183b998b325d29be35498b5a43167ec0d0493bb759382107ecdb4773dba6a5636ab3f00bb8ad21e8 SHA512 67ba8fa78d297c6f6489731b8cd55c70af63405788f5c19786ccaeca28a3ba55fac5b14a5e09dab77783e7b2406ed5340e9da3ae3d7ecb46a90a6c481e574dfd +EBUILD mod_survey-3.2.5.ebuild 1750 BLAKE2B 1c07e5ca38510e767f230204205837452dc0bf43cb40e71c95745951879ee77160d045c12975d26841428ba52b870e867633f5df3b3d6abcb134fe0aafbcaa49 SHA512 627a0f429912bfae5d1fdf49668c77747eeec17d6d3ca9f5f5b6335d884ea2254cafaa89fb1ca426fcc0a799a5774af467a48d1140db64e7ded7265f1167f91e MISC metadata.xml 250 BLAKE2B 856ff9793486ce226d86aeb43e3c5a75acf1fdd49936d52cf09e72669d2e956844d9087cf5cb67d4f04353d30be644bfc1daaa70b2ae332651f4bf71ae5c31e8 SHA512 8a7934e6db1aa1e0aba026a0438fb291819be69c134d54bb3af0638facc3e0a47bc30557c944bfaf5adbdd1dbdcbc96dec88d69ab809b1758e5701ff38fc6282 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 130996dca760..4fef9c59543a 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 |