From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id D43C01382B5 for ; Wed, 15 Jun 2016 04:19:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4D37BE096C; Wed, 15 Jun 2016 04:19:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BE71DE096C for ; Wed, 15 Jun 2016 04:19:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C272433E142 for ; Wed, 15 Jun 2016 04:19:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 53E921BA1 for ; Wed, 15 Jun 2016 04:19:07 +0000 (UTC) From: "Matthias Maier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthias Maier" Message-ID: <1465964339.af672b80bbf952b557244f39f8f77c3fa9c3c7f3.tamiko@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-doc/doxygen/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-doc/doxygen/doxygen-1.8.11-r1.ebuild app-doc/doxygen/doxygen-1.8.11-r2.ebuild app-doc/doxygen/doxygen-9999.ebuild X-VCS-Directories: app-doc/doxygen/ X-VCS-Committer: tamiko X-VCS-Committer-Name: Matthias Maier X-VCS-Revision: af672b80bbf952b557244f39f8f77c3fa9c3c7f3 X-VCS-Branch: master Date: Wed, 15 Jun 2016 04:19:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5db16642-5ffb-4734-a922-dd2371c82905 X-Archives-Hash: 78a3018bd2dc690977c785b8b26383fd commit: af672b80bbf952b557244f39f8f77c3fa9c3c7f3 Author: Matthias Maier gentoo org> AuthorDate: Wed Jun 15 04:18:27 2016 +0000 Commit: Matthias Maier gentoo org> CommitDate: Wed Jun 15 04:18:59 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af672b80 app-doc/doxygen: remove LINGUAS use expand, bug #584782 doxygen has language support in form of quite a number of "translator" units. We had the habit of fine-tuning the translator units that are actually built via the LINGUAS use expand mechanism. But this is a broken approach due to the following reasons: - "translator" units are lightweight header files that are built into doxygen during compilation. No external dependencies are required. - Traditionally, the LINGUAS variable is used for packages to determine runtime language support (especially for GUI programs, etc) that usually requires additional packages to be installed - i.e., LINGUAS controls the languages supported in CLI and GUI applications. doxygen's support for translator units does *not* fit into this scheme at all. - Not all translator units have a LINGUAS equivalent (!!) - Hand selecting supported LINGUAS is a maintenance burden. Therefore, I just got rid of it and install *all supported* "translator" unconditionally. Package-Manager: portage-2.2.28 ...n-1.8.11-r1.ebuild => doxygen-1.8.11-r2.ebuild} | 36 ---------------------- app-doc/doxygen/doxygen-9999.ebuild | 36 ---------------------- 2 files changed, 72 deletions(-) diff --git a/app-doc/doxygen/doxygen-1.8.11-r1.ebuild b/app-doc/doxygen/doxygen-1.8.11-r2.ebuild similarity index 81% rename from app-doc/doxygen/doxygen-1.8.11-r1.ebuild rename to app-doc/doxygen/doxygen-1.8.11-r2.ebuild index d7d281d..6f49a8b 100644 --- a/app-doc/doxygen/doxygen-1.8.11-r1.ebuild +++ b/app-doc/doxygen/doxygen-1.8.11-r2.ebuild @@ -24,13 +24,6 @@ LICENSE="GPL-2" SLOT="0" IUSE="clang debug doc dot doxysearch latex qt5 sqlite userland_GNU" -#missing SerbianCyrilic, JapaneseEn, KoreanEn, Chinesetraditional -LANGS=(hy ar pt_BR ca zh cs de da eo es fa fi fr el hr hu id it ja ko lt mk -nl nb pl pt ro ru sl sk sr sv tr uk vi af) -for X in "${LANGS[@]}" ; do - IUSE="${IUSE} linguas_${X}" -done - RDEPEND="app-text/ghostscript-gpl dev-lang/perl media-libs/libpng:0= @@ -61,34 +54,6 @@ DEPEND="sys-apps/sed RESTRICT="test" EPATCH_SUFFIX="patch" -get_langs() { - # using only user set linguas also fixes #263641 - my_linguas=() - for lingua in ${LINGUAS}; do - if has ${lingua} "${LANGS[@]}"; then - case ${lingua} in - hy) lingua=am ;; - pt_BR) lingua=br ;; - zh*) lingua=cn ;; - cs) lingua=cz ;; - da) lingua=dk ;; - el*) lingua=gr ;; - ja*) lingua=jp ;; - ko) lingua=kr ;; - nb) lingua=no ;; - sl) lingua=si ;; - tr*) lingua=tr ;; - uk) lingua=ua ;; - af) lingua=za ;; - esac - has ${lingua} "${my_linguas[@]}" || - my_linguas+=(${lingua}) - fi - done - f_langs="${my_linguas[@]^^}" - echo ${f_langs// /;} -} - pkg_setup() { use doc && python-any-r1_pkg_setup } @@ -126,7 +91,6 @@ src_prepare() { src_configure() { local mycmakeargs=( -DDOC_INSTALL_DIR="share/doc/${P}" - -DLANG_CODES="$(get_langs)" $(cmake-utils_use clang use_libclang) $(cmake-utils_use doc build_doc) $(cmake-utils_use doxysearch build_search) diff --git a/app-doc/doxygen/doxygen-9999.ebuild b/app-doc/doxygen/doxygen-9999.ebuild index fbd083e..ec664ad 100644 --- a/app-doc/doxygen/doxygen-9999.ebuild +++ b/app-doc/doxygen/doxygen-9999.ebuild @@ -25,13 +25,6 @@ LICENSE="GPL-2" SLOT="0" IUSE="clang debug doc dot doxysearch latex qt5 sqlite userland_GNU" -#missing SerbianCyrilic, JapaneseEn, KoreanEn, Chinesetraditional -LANGS=(hy ar pt_BR ca zh cs de da eo es fa fi fr el hr hu id it ja ko lt mk -nl nb pl pt ro ru sl sk sr sv tr uk vi af) -for X in "${LANGS[@]}" ; do - IUSE="${IUSE} linguas_${X}" -done - RDEPEND="app-text/ghostscript-gpl dev-lang/perl media-libs/libpng:0= @@ -62,34 +55,6 @@ DEPEND="sys-apps/sed RESTRICT="test" EPATCH_SUFFIX="patch" -get_langs() { - # using only user set linguas also fixes #263641 - my_linguas=() - for lingua in ${LINGUAS}; do - if has ${lingua} "${LANGS[@]}"; then - case ${lingua} in - hy) lingua=am ;; - pt_BR) lingua=br ;; - zh*) lingua=cn ;; - cs) lingua=cz ;; - da) lingua=dk ;; - el*) lingua=gr ;; - ja*) lingua=jp ;; - ko) lingua=kr ;; - nb) lingua=no ;; - sl) lingua=si ;; - tr*) lingua=tr ;; - uk) lingua=ua ;; - af) lingua=za ;; - esac - has ${lingua} "${my_linguas[@]}" || - my_linguas+=(${lingua}) - fi - done - f_langs="${my_linguas[@]^^}" - echo ${f_langs// /;} -} - pkg_setup() { use doc && python-any-r1_pkg_setup } @@ -125,7 +90,6 @@ src_prepare() { src_configure() { local mycmakeargs=( -DDOC_INSTALL_DIR="share/doc/${P}" - -DLANG_CODES="$(get_langs)" $(cmake-utils_use clang use_libclang) $(cmake-utils_use doc build_doc) $(cmake-utils_use doxysearch build_search)