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 983DC13888F for ; Tue, 13 Oct 2015 00:20:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 68950E07FE; Tue, 13 Oct 2015 00:20:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6119321C006 for ; Tue, 13 Oct 2015 00:20:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 10428340894 for ; Tue, 13 Oct 2015 00:20:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E82B5F74 for ; Tue, 13 Oct 2015 00:20:33 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1444695271.179f6d9db953b440efc34810f7188df5a4c45ef2.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/gettext/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/gettext/gettext-0.19.6-r1.ebuild X-VCS-Directories: sys-devel/gettext/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 179f6d9db953b440efc34810f7188df5a4c45ef2 X-VCS-Branch: master Date: Tue, 13 Oct 2015 00:20:33 +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: 5dc28e26-8900-4c46-9203-4016c0b837dc X-Archives-Hash: d5b273b7eec9d1c83c95f117dd630cf2 commit: 179f6d9db953b440efc34810f7188df5a4c45ef2 Author: Mike Frysinger gentoo org> AuthorDate: Mon Oct 12 23:07:22 2015 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Tue Oct 13 00:14:31 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=179f6d9d sys-devel/gettext: simplify configure flag setup slightly We don't really need to omit these flags when building the shared libs, so move them all into one common block to simplify the code a bit. sys-devel/gettext/gettext-0.19.6-r1.ebuild | 36 +++++++++++++----------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/sys-devel/gettext/gettext-0.19.6-r1.ebuild b/sys-devel/gettext/gettext-0.19.6-r1.ebuild index 9a0ac98..6f23d99 100644 --- a/sys-devel/gettext/gettext-0.19.6-r1.ebuild +++ b/sys-devel/gettext/gettext-0.19.6-r1.ebuild @@ -54,9 +54,25 @@ multilib_src_configure() { --cache-file="${BUILD_DIR}"/config.cache --docdir="/usr/share/doc/${PF}" + # Emacs support is now in a separate package + --without-emacs + --without-lispdir + # glib depends on us so avoid circular deps + --with-included-glib + # libcroco depends on glib which ... ^^^ + --with-included-libcroco + # this will _disable_ libunistring (since it is not bundled), + # see bug #326477 + --with-included-libunistring + + $(use_enable acl) $(use_enable cxx c++) $(use_enable cxx libasprintf) + $(use_with git) + $(usex git --without-cvs $(use_with cvs)) $(use_enable java) + $(use_enable ncurses curses) + $(use_enable openmp) $(use_enable static-libs static) ) @@ -77,26 +93,6 @@ multilib_src_configure() { if ! multilib_is_native_abi ; then # for non-native ABIs, we build runtime only ECONF_SOURCE+=/gettext-runtime - else - # remaining switches - myconf+=( - # Emacs support is now in a separate package - --without-emacs - --without-lispdir - # glib depends on us so avoid circular deps - --with-included-glib - # libcroco depends on glib which ... ^^^ - --with-included-libcroco - # this will _disable_ libunistring (since it is not bundled), - # see bug #326477 - --with-included-libunistring - - $(use_enable acl) - $(use_enable ncurses curses) - $(use_enable openmp) - $(use_with git) - $(usex git --without-cvs $(use_with cvs)) - ) fi econf "${myconf[@]}"