From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 12 Oct 2015 23:07:22 +0000 (-0400)
Subject: sys-devel/gettext: simplify configure flag setup slightly
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=179f6d9db953b440efc34810f7188df5a4c45ef2;p=gentoo.git

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.
---

diff --git a/sys-devel/gettext/gettext-0.19.6-r1.ebuild b/sys-devel/gettext/gettext-0.19.6-r1.ebuild
index 9a0ac980a1f2..6f23d9997636 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[@]}"