[patch] gettext-0.18.3.1-r2.diff

gettext-0.18.3.1-r2.diff (text/plain), 2.89 KB, created by David Heidelberg (okias) on 2014-01-01 17:44:27 UTC

v2
* s/multilib_is_native_abi/multilib_build_binaries/ thx to tommy & mgorny
* else statement with --disable

--- gettext-0.18.3.1-r1.ebuild	2013-12-16 08:31:35.000000000 +0100
+++ gettext-0.18.3.1-r2.ebuild	2014-01-01 18:42:20.682270458 +0100
@@ -4,7 +4,7 @@
 
 EAPI="4"
 
-inherit flag-o-matic eutils multilib toolchain-funcs mono-env libtool java-pkg-opt-2
+inherit flag-o-matic eutils multilib toolchain-funcs mono-env libtool java-pkg-opt-2 multilib-minimal
 
 DESCRIPTION="GNU locale utilities"
 HOMEPAGE="http://www.gnu.org/software/gettext/"
@@ -15,9 +15,9 @@
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="acl -cvs doc emacs git java nls +cxx ncurses openmp static-libs elibc_glibc"
 
-DEPEND="virtual/libiconv
-	dev-libs/libxml2
-	dev-libs/expat
+DEPEND="virtual/libiconv[${MULTILIB_USEDEP}]
+	dev-libs/libxml2[${MULTILIB_USEDEP}]
+	dev-libs/expat[${MULTILIB_USEDEP}]
 	acl? ( virtual/acl )
 	ncurses? ( sys-libs/ncurses )
 	java? ( >=virtual/jdk-1.4 )"
@@ -27,14 +27,18 @@
 	java? ( >=virtual/jre-1.4 )"
 PDEPEND="emacs? ( app-emacs/po-mode )"
 
+DOCS=( AUTHORS ChangeLog NEWS README THANKS )
+
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-use_m4_fallback_dir.patch #487794
 	java-pkg-opt-2_src_prepare
 	epunt_cxx
 	elibtoolize
+
+	multilib_copy_sources
 }
 
-src_configure() {
+multilib_src_configure() {
 	local myconf=""
 	# Build with --without-included-gettext (on glibc systems)
 	if use elibc_glibc ; then
@@ -44,6 +48,14 @@
 	fi
 	use cxx || export CXX=$(tc-getCC)
 
+	if multilib_build_binaries; then
+		myconf+=" $(use_enable acl)
+				  $(use_enable java)
+				  $(use_enable ncurses curses)"
+	else
+		myconf+=" --disable-acl --disable-java --disable-curses"
+	fi
+
 	# --without-emacs: Emacs support is now in a separate package
 	# --with-included-glib: glib depends on us so avoid circular deps
 	# --with-included-libcroco: libcroco depends on glib which ... ^^^
@@ -51,23 +63,20 @@
 	# --with-included-libunistring will _disable_ libunistring (since
 	# --it's not bundled), see bug #326477
 	econf \
-		--cache-file="${S}"/config.cache \
+		--cache-file="${S}-${ABI}"/config.cache \
 		--docdir="/usr/share/doc/${PF}" \
 		--without-emacs \
 		--without-lispdir \
-		$(use_enable java) \
 		--with-included-glib \
 		--with-included-libcroco \
 		--with-included-libunistring \
-		$(use_enable acl) \
-		$(use_enable ncurses curses) \
 		$(use_enable openmp) \
 		$(use_enable static-libs static) \
 		$(use_with git) \
 		$(usex git --without-cvs $(use_with cvs))
 }
 
-src_install() {
+multilib_src_install() {
 	emake install DESTDIR="${D}"
 	use nls || rm -r "${D}"/usr/share/locale
 	use static-libs || rm -f "${D}"/usr/lib*/*.la
@@ -99,8 +108,6 @@
 		rm -rf "${D}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1}
 	fi
 	rm -f "${D}"/usr/share/doc/${PF}/*.html
-
-	dodoc AUTHORS ChangeLog NEWS README THANKS
 }
 
 pkg_preinst() {