Version bump. Added multilib support (bug #496218)

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

3 files changed, 170 insertions, 15 deletions

diff --git a/sys-devel/gettext/ChangeLog b/sys-devel/gettext/ChangeLog
index e3627af212f7..682a0eab0c0c 100644
--- a/sys-devel/gettext/ChangeLog
+++ b/sys-devel/gettext/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/gettext
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.228 2014/01/07 09:33:35 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.229 2014/01/16 13:35:35 polynomial-c Exp $
+
+*gettext-0.18.3.2 (16 Jan 2014)
+
+  16 Jan 2014; Lars Wendler <polynomial-c@gentoo.org> +gettext-0.18.3.2.ebuild:
+  Version bump. Added multilib support (bug #496218).
 
   07 Jan 2014; Lars Wendler <polynomial-c@gentoo.org>
   -gettext-0.18.1.1-r1.ebuild, -gettext-0.18.1.1-r2.ebuild,
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index e2ebb098c387..056568e83aa1 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -4,24 +4,26 @@ Hash: SHA256
 AUX gettext-0.18.3.1-use_m4_fallback_dir.patch 646 SHA256 2648ff594e544b706f16c4bebf87da126940e23cba438e32757cdf6d2ec15b83 SHA512 3dc8486b71c6cea0e2b1761056c1517babde201bcc3213f630cd6e0f6750da044be64584de95986ff24a60635049241aeb9a5fa95d6776a7a11b6ecdd000a824 WHIRLPOOL dc563b318d679c7f1429306a1f783ca21859a71ae68ae81403ae4b55a7399d8528d396500b3dd12d3710bbcb8eba00f36415b49dbb0d836aa918bd4267d9ae1d
 DIST gettext-0.18.2.tar.gz 15697875 SHA256 516a6370b3b3f46e2fc5a5e222ff5ecd76f3089bc956a7587a6e4f89de17714c SHA512 6df3acc6be3d8bce0fea3c03e7196426601cd0202af79f10042160248ba4a5417f0e15f0f7b79321c4f189c73d1e5017e5598db15c261e2675d05ba4491d3815 WHIRLPOOL b290d4866b0ed63545b308450dbd79def0183f572e3a2bbde36ce69652631c3a457701ae2cf54f91790608dd864a2111528089de21bbc8a9ab7346074f4d713b
 DIST gettext-0.18.3.1.tar.gz 16341773 SHA256 0d8f9a33531b77776b3dc473e7940019ca19bfca5b4c06db6e96065eeb07245d SHA512 b41f4ae5b5dc6459a9b87d6445c259ab8d8500fe760e4c5e6992245e96a1bf1b8ce424be82ff07bd67942301af7d9af4d2219643297e4baadfc8570ad9ab72cc WHIRLPOOL d3384bf5094a19ea799b82f4c3358183daf6382183849716ca5da824c18371230435668a336c9337a05a9975baa481728c6521adf80e6ed3575b329d26c99c24
+DIST gettext-0.18.3.2.tar.gz 16189249 SHA256 d1a4e452d60eb407ab0305976529a45c18124bd518d976971ac6dc7aa8b4c5d7 SHA512 0cf8f2bb844b9d94f5e63a0f4bddc133e2388d103fd4189614d2fc157a94e27836ec399eb32ab69410e2214425676e6bc195bbf13238cc5ad32b454ec6e2b5ef WHIRLPOOL 0bb2e33788a12fbeaa4756aaa354a308424cdea5008d6b686bbd8601b7b7c513483d79f323904ebaf94e1fd67f65dfa7cb993ba5c5751e16a297b94b3307ae66
 EBUILD gettext-0.18.2.ebuild 3436 SHA256 11aff7b86a924a3987c52a80e49a9fa03dc2770982aefc5a9a1bf34471d3d2b2 SHA512 687e150ca2eaed5507985ab9d85d525b6d3797da1efb7c3d8944caa3a5593d52a79d71f97003adb310845fe1d7fd239aad2b2fdb3307fc3b0d817802365dc9da WHIRLPOOL 8bea8c70d3a61cae4d1fed0dad52bc85118ea6a5ec2e497ba78ad99cd9c440ad333f5e3d70131267451ef42629a679fd7dfdc84a70c02b4b343059b6f0eee516
 EBUILD gettext-0.18.3.1-r1.ebuild 3507 SHA256 c13382acd252e517659605abc5c6c2e12e84f0d78eec109c6a2063c878fd8d8e SHA512 305bfc5545af00628f73703e6b49122042e9dd93093a1fe075f2a1163e752017a7102cff8f768e07724ab223671a229085882475604427339b4559ab68039db2 WHIRLPOOL ba7205dee248a9d0e98a15c3be350f00ca4e9ec2f6e83aed4da7ce8f2a0aef41603eb7a07f750bd740cabb61266fb5029580f316617f962161731cd2d59a30b4
-MISC ChangeLog 30379 SHA256 a1e0db01796cf2808df87f31655d2c81a806739044badcf62b22e2194be7d1a2 SHA512 d7328af12f6a62623770964d73ea1f2c95a3a9e24bd32991acc678aea934da9cb48d19f6b9f4c3b59c15f799ef2d52d7f2c6006f71d4ea89d5bb89da9a14c9f7 WHIRLPOOL a54eaaa938aa6a7721594f76917040a7d01d6066bf5d932e7f0a25dfea31fb7c51c4d619fa409443c075e9dbaa219bb7e39e17e53b345853884eb4feba96052b
+EBUILD gettext-0.18.3.2.ebuild 3824 SHA256 6f72ab58c322f0d7a97a5264ea9b5c49ec1b969ab6a24ace592dfb0a96929def SHA512 8d2e9b899986b6da369fd9b16947618be81bc1459a557eced89127e5bb609705e0d98a6e8444a5dad82841214cac807ff12bb7b7d388c16492e430256b93a8cc WHIRLPOOL 5d68575374834a48a46a92afa9482520fe78524a2c5aa9971d185330014c588842ccf8f72b62ed3ed2e29d678b0fa88edfbb7ffdf465163109442858c8913142
+MISC ChangeLog 30547 SHA256 54253be2d89601138baa07692d89a6b5c357bd8c794dbef7da0887ead9628a38 SHA512 c253e6d0e859b05dc189d1164d6100e64bff3bc159fa9b9101aea26864059d28b821fea6764d71875abd42ee04903562cad953dce85eb719b4aaa368d1711c2e WHIRLPOOL 58066ad160304beb1af5ae3157dbb1cb02765fc845e5dbeb36491e92f0d0e8fa37cb795dab2bbd00282517d63f7daae89708eb55599052cf4efacda25c5714e8
 MISC metadata.xml 563 SHA256 414278bb30c3b2309bb33176d15a3fd4b69d70cbf18e7e58320d799066c821ab SHA512 62c3e03f6384fa66cbdeab39e01f003da47a57751e6d79e71c14ab7e2057c838815cc612e930bae437eb0230106a7bbfc2a62c777cbba5b322eae766c3b12122 WHIRLPOOL c4cb0348aa1fb450e429be93bdc6f918340575e98dfedb237e55b21906ba9ce545cbffa60c6a5ccf65da0d74b58ebd0cadd6ccc797ba8bc21d680e6fbe1edfbd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSy8nwAAoJEPiazRVxLXTFyT0QAMD0AttoroiQpXrUJxZoq+L5
-UgdOzAcAbdClO8hGZj+Am0cURZaxucjUz9EuuxnN9GjOlSYdikJH3m8x/LccRxfc
-nxtDPC0p14US2VampMgqAAqUfYrvkmmzTN5xKIw1soSuoDcfE4laCyMub6FWCtWe
-m9QhdiS1ppGjlopkeS0YtyzN7yP8HR1vS+a5/03vGWufv44aY4X/XXKXxeeLde7T
-iEPN3YwQg3FxpCBBNGdd9KF5DqGQu6F0O4rQXDtDBv2T1uT56dv2QIU17f2OGR0Q
-8uHwi8QZpyw5ovyIH8mqEymrjPfHPsUu6ALO0YFdZLXHjJGvLQ7jUx5Tm4RtaSxD
-iey9ISERrVEWsdqEUYmxiHeu5fzNWggXlUwJkfWNxuMNIWSJEluTUNFyVBXpL8KG
-4yTjt0SL6DFy8F3lF7fTvtq1HZvqYLFLPotY+T9C4DLL5Y0o2VVlYM6wpZ3QARe3
-YnjVkWMzC2S+YyGGl0YA/hdABPAzF78DXsdu6UCY2Qj77AOhOQUfZdMjX3SIluAy
-zhfDPL5N7PiWg4J2AOxy6gvu0tI65F/vwnUfChVsUECv8V0K8QMvPj4X7DMtLZsH
-32jfB2nw5AcXXF80ILrkn03nWGksLsMqHB8raVZE458VIhN0MpKDEBNq4rg+wYBl
-nlAAVnT5K+qACcAYAK6n
-=kHn+
+iQIcBAEBCAAGBQJS1+ApAAoJEPiazRVxLXTF9UAP/R3Jhindnvh/fRPv/VxZikBJ
+EGTmFAgTDcjzeDQfcNUv/fusPaxqSPTHvLA95cLyudlMReZI2FQ6IVSf92JkWAEP
+2EUjG4Niyh0VeeG+7FouVg+ZoROt/ZC98KevOc1UPoaPwpEpl4Nc5eJIdIK7U46x
+CzUDAaOVMsiuWrBWGt2GrOL4kiCqSiI5u3NtS2Ji+2y3BjIzqfxd/L9cbdu9FNOa
+ZdxQiNCBMgtY8g8Nyj5ftbEUYEAjSTOEXTKuq5LeObwpI55J6vpaHmuH1JOQTElZ
+Zgm22lB7TvBJ1R4xOiW2fQOzYh+gz0FmcF9aVCPYhUkwmalfrX7xUrQ3t/fGSSxP
+pQuhMdM2GHUiNDA/FgMCQXya54sS4QTb4Yxi7leLtM0x9wxlnAoi2yBWysomu4aJ
+NL3UNNjGqPTSq22vVQyGMFoZuNecRtcgSJWJKxMTc+1N/bgPfSVgcZ6elGlD0+CH
+HoJbVxHGl8Hk/6PO+vdgQl3VWMys9jgbwHoatNe777nHo4SvBrC/XPQwhYtLCUzp
+Fd7hJsuqoNDLEDczcYGvzgiHgQ6aC5fNO40zVclImeVBt3i0cKbNOoAH0jurhcsH
+gsnluEYMDSWFSNFgKWfBhIlLMQ0Vif+UHZqkTdax0bzTGuNoaYlGdsHF0YkQ8szB
+1j1oeLQlZn+leVHgVO2+
+=/ned
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gettext/gettext-0.18.3.2.ebuild b/sys-devel/gettext/gettext-0.18.3.2.ebuild
new file mode 100644
index 000000000000..a453ca946a4e
--- /dev/null
+++ b/sys-devel/gettext/gettext-0.18.3.2.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.18.3.2.ebuild,v 1.1 2014/01/16 13:35:36 polynomial-c Exp $
+
+EAPI="4"
+
+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/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-2"
+SLOT="0"
+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"
+
+# only runtime goes multilib
+DEPEND="virtual/libiconv[${MULTILIB_USEDEP}]
+	dev-libs/libxml2
+	dev-libs/expat
+	acl? ( virtual/acl )
+	ncurses? ( sys-libs/ncurses )
+	java? ( >=virtual/jdk-1.4 )"
+RDEPEND="${DEPEND}
+	!git? ( cvs? ( dev-vcs/cvs ) )
+	git? ( dev-vcs/git )
+	java? ( >=virtual/jre-1.4 )
+	abi_x86_32? (
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+		!<=app-emulation/emul-linux-x86-baselibs-20131008-r8
+	)"
+PDEPEND="emacs? ( app-emacs/po-mode )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	# only installed for native ABI
+	/usr/include/gettext-po.h
+)
+
+src_prepare() {
+	java-pkg-opt-2_src_prepare
+	epunt_cxx
+	elibtoolize
+}
+
+multilib_src_configure() {
+	local myconf=(
+		# switches common to runtime and top-level
+		--cache-file="${BUILD_DIR}"/config.cache
+		--docdir="/usr/share/doc/${PF}"
+
+		$(use_enable cxx libasprintf)
+		$(use_enable java)
+		$(use_enable static-libs static)
+	)
+
+	# Build with --without-included-gettext (on glibc systems)
+	if use elibc_glibc ; then
+		myconf+=(
+			--without-included-gettext
+			$(use_enable nls)
+		)
+	else
+		myconf+=(
+			--with-included-gettext
+			--enable-nls
+		)
+	fi
+	use cxx || export CXX=$(tc-getCC)
+
+	local ECONF_SOURCE=${S}
+	if ! multilib_build_binaries ; 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[@]}"
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_build_binaries ; then
+		dosym msgfmt /usr/bin/gmsgfmt #43435
+		dobin gettext-tools/misc/gettextize
+
+		[[ ${USERLAND} == "BSD" ]] && gen_usr_ldscript -a intl
+	fi
+}
+
+multilib_src_install_all() {
+	use nls || rm -r "${D}"/usr/share/locale
+	use static-libs || prune_libtool_files --all
+
+	rm -f "${D}"/usr/share/locale/locale.alias "${D}"/usr/lib/charset.alias
+
+	if use java ; then
+		java-pkg_dojar "${D}"/usr/share/${PN}/*.jar
+		rm -f "${D}"/usr/share/${PN}/*.jar
+		rm -f "${D}"/usr/share/${PN}/*.class
+		if use doc ; then
+			java-pkg_dojavadoc "${D}"/usr/share/doc/${PF}/javadoc2
+			rm -rf "${D}"/usr/share/doc/${PF}/javadoc2
+		fi
+	fi
+
+	if use doc ; then
+		dohtml "${D}"/usr/share/doc/${PF}/*.html
+	else
+		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() {
+	# older gettext's sometimes installed libintl ...
+	# need to keep the linked version or the system
+	# could die (things like sed link against it :/)
+	preserve_old_lib /{,usr/}$(get_libdir)/libintl$(get_libname 7)
+
+	java-pkg-opt-2_pkg_preinst
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /{,usr/}$(get_libdir)/libintl$(get_libname 7)
+}